diff --git a/ChangeLog b/ChangeLog
index ff36946836c3dad4474110299e1ee94c0fc5ad03..88b054ac6d8aa5486ea19e7d3d844b4d8ae74aac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2006-07-27 Benedikt Meurer <benny@xfce.org>
+
+ * README, acinclude.m4, configure.in.in, thunar-vfs/, thunar/,
+ plugins/thunar-apr/thunar-apr-provider.c,
+ plugins/thunar-uca/thunar-uca-model.c: Import the trash framework,
+ based on the XDG trash specification, but currently limited to the
+ home trash.
+ * thunar/thunar-file.{c,h}, thunar/thunar-standard-view.c
+ (thunar_standard_view_merge_custom_actions): Remove obsolete
+ thunar_file_get_actions(). Bug #1241.
+ * thunar/thunar-file.c, thunar/thunar-util.{c,h}: Use localized
+ human readable format for file dates. Bug #2057.
+ * thunar/thunar-private.h, thunar/thunar-tree-model.c,
+ thunar/thunar-thumbnail-generator.c, thunar/thunar-shortcuts-model.c,
+ thunar/thunar-renamer-pair.c, thunar/thunar-renamer-model.c,
+ thunar/thunar-clipboard-manager.c: Use the slice allocator to reduce
+ the memory overhead.
+ * thunar/thunar-gtk-extensions.{c,h}, thunar/thunar-chooser-button.c,
+ thunar/thunar-permissions-chooser.c, thunar/thunar-chooser-dialog.c,
+ thunar/thunar-preferences-dialog.c, thunar/thunar-renamer-dialog.c,
+ thunar/thunar-size-label.c: Use a single shared GtkTooltips instance
+ for the whole application.
+ * thunar/thunar-path-entry.c: Update the path entry icon and text
+ whenever the current file changes.
+ * README, acinclude.m4, configure.in.in, plugins/thunar-tpa/: Add a
+ trash panel applet, that communicates with Thunar via D-BUS to
+ display the current state of the trash can and move files to the
+ trash by dropping them to the panel applet.
+ * thunar/thunar-preferences.c(thunar_preferences_class_init),
+ docs/README.thunarrc: Disable case-sensitive sorting of the
+ files by default. Bug #2064.
+ * docs/reference/thunar-vfs/: Update the API documentation.
+ * po/POTFILES.in: Add new files here.
+ * po/Thunar.pot, po/*.po: Merge new strings.
+ * po/de.po: Update german translations.
+
2006-07-22 Benedikt Meurer <benny@xfce.org>
* thunar/thunar-renamer-progress.c(thunar_renamer_progress_next_idle):
diff --git a/README b/README
index 88ce407dad0a7520439d8edfbdfc49649205fd27..78bb4560020162ea431afc34c381a20d933929b4 100644
--- a/README
+++ b/README
@@ -28,6 +28,7 @@ Thunar can optionally use the following packages:
- libjpeg 6 or above
- libstartup-notification 0.4 or above
- pcre 6.0 or above
+ - xfce4-panel 4.3.90 or above (for the trash applet)
Installation
@@ -83,6 +84,9 @@ Thunar supports the following standards/specifications:
* File URI Specification
http://freedesktop.org/wiki/Standards_2ffile_2duri_2dspec
+ * Desktop Trash Can Specification
+ http://freedesktop.org/wiki/Standards_2ftrash_2dspec
+
How to report bugs?
===================
diff --git a/acinclude.m4 b/acinclude.m4
index 357551add463156567bb01fed5b507b3428f0e09..9dc474382462ff9c8c6cc97bb15889ea85818252 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -46,6 +46,34 @@ XDT_CHECK_OPTIONAL_PACKAGE([PCRE], [libpcre], [6.0], [pcre], [Regular expression
+dnl # BM_THUNAR_PLUGIN_TPA()
+dnl #
+dnl # Check whether the "Trash Panel Applet" plugin should
+dnl # be built and installed (this is actually a plugin
+dnl # for the Xfce panel, not for Thunar).
+dnl #
+AC_DEFUN([BM_THUNAR_PLUGIN_TPA],
+[
+AC_ARG_ENABLE([tpa-plugin], AC_HELP_STRING([--disable-tpa-plugin], [Don't build the thunar-tpa plugin, see plugins/thunar-tpa/README]),
+ [ac_bm_thunar_plugin_tpa=$enable_val], [ac_bm_thunar_plugin_tpa=yes])
+if test x"$ac_bm_thunar_plugin_tpa" = x"yes"; then
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90],
+ [
+ dnl # Can only build thunar-tpa if D-BUS was found previously
+ ac_bm_thunar_plugin_tpa=$DBUS_FOUND
+ ],
+ [
+ dnl # Cannot build thunar-tpa if xfce4-panel is not installed
+ ac_bm_thunar_plugin_tpa=no
+ ])
+fi
+AC_MSG_CHECKING([whether to build the thunar-tpa plugin])
+AM_CONDITIONAL([THUNAR_PLUGIN_TPA], [test x"$ac_bm_thunar_plugin_tpa" = x"yes"])
+AC_MSG_RESULT([$ac_bm_thunar_plugin_tpa])
+])
+
+
+
dnl # BM_THUNAR_PLUGIN_UCA()
dnl #
dnl # Check whether the "User Customizable Actions" plugin
@@ -113,6 +141,36 @@ AC_SUBST([LIBFAM_LIBS])
+dnl # BM_THUNAR_VFS_OS_IMPL()
+dnl #
+dnl # Determine the operating system support to use
+dnl # for thunar-vfs.
+dnl #
+dnl # Sets ac_bm_thunar_vfs_os_impl to "bsd" or "generic" and
+dnl # defines the automake conditional THUNAR_VFS_OS_IMPL_BSD.
+dnl #
+AC_DEFUN([BM_THUNAR_VFS_OS_IMPL],
+[
+ dnl # Auto-detect target operating system support
+ AC_MSG_CHECKING([for operating system support])
+ case "$target_os" in
+ dragonfly*|freebsd*|netbsd*|openbsd*|darwin*)
+ dnl # The BSD Family is fully supported
+ ac_bm_thunar_vfs_os_impl=bsd
+ ;;
+
+ *)
+ dnl # Otherwise fallback to generic OS support
+ ac_bm_thunar_vfs_os_impl=generic
+ esac
+ AC_MSG_RESULT([$ac_bm_thunar_vfs_os_impl])
+
+ dnl # Set automake conditionals appropriately
+ AM_CONDITIONAL([THUNAR_VFS_OS_IMPL_BSD], [test x"$ac_bm_thunar_vfs_os_impl" = x"bsd"])
+])
+
+
+
dnl # BM_THUNAR_VFS_VOLUME_IMPL()
dnl #
dnl # Determines the volume manager implementation to
diff --git a/configure.in.in b/configure.in.in
index 8793cc45c9a473907fd19d20da1fb5ebd9fd1580..8f7865e9bac7501efc715b9dac385add3bd86f26 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl
dnl ***************************
dnl *** Version information ***
dnl ***************************
-m4_define([thunar_verinfo], [3:0:1])
+m4_define([thunar_verinfo], [4:0:2])
m4_define([thunar_version_api], [1])
m4_define([thunar_version_major], [0])
m4_define([thunar_version_minor], [3])
@@ -114,9 +114,9 @@ dnl *** Check for standard functions ***
dnl ************************************
AC_FUNC_MMAP()
AC_CHECK_FUNCS([attropen extattr_get_fd fgetxattr lchmod localeconv \
- localtime_r mbrtowc mkfifo pread pwrite readdir_r readlink \
+ localtime_r mbrtowc mkfifo pread pwrite readdir_r \
sched_yield setgroupent setpassent statfs statvfs strcoll \
- symlink])
+ strlcpy symlink])
dnl ***************************************
dnl *** Check for working posix_madvise ***
@@ -150,6 +150,38 @@ AC_TRY_LINK([#include <sys/mman.h>], posix_madvise_test(),
])
])
+dnl **********************************
+dnl *** Check for working strptime ***
+dnl **********************************
+if test x"$GCC" = x"yes"; then
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror" # to detect a protected declaration
+ m4_define([strptime_test], [ strptime (0, 0, 0); ])
+ AC_MSG_CHECKING([for working strptime])
+ AC_TRY_LINK([#include <time.h>], strptime_test,
+ [
+ AC_DEFINE([HAVE_STRPTIME], [1], [Define if strptime is working])
+ AC_MSG_RESULT([yes])
+ ],
+ [
+ dnl As usual, Linux/glibc doesn't work properly out-of-the-box
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D__USE_XOPEN"
+ AC_TRY_LINK([#include <time.h>], strptime_test,
+ [
+ AC_DEFINE([HAVE_STRPTIME], [1], [Define if strptime is working])
+ AC_MSG_RESULT([yes])
+ ],
+ [
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ AC_MSG_RESULT([no])
+ ])
+ ])
+ CFLAGS="$ac_save_CFLAGS"
+else
+ AC_CHECK_FUNCS([strptime])
+fi
+
dnl ******************************
dnl *** Check for i18n support ***
dnl ******************************
@@ -245,6 +277,11 @@ if test x"$enable_xml2po" = x"yes"; then
fi
AM_CONDITIONAL([ENABLE_XML2PO], [test x"$enable_xml2po" = x"yes"])
+dnl ******************************************
+dnl *** Check for operating system support ***
+dnl ******************************************
+BM_THUNAR_VFS_OS_IMPL()
+
dnl ****************************************************
dnl *** Check for file system monitor implementation ***
dnl ****************************************************
@@ -368,6 +405,7 @@ dnl *** Check for additional plugins ***
dnl ************************************
BM_THUNAR_PLUGIN_APR()
BM_THUNAR_PLUGIN_SBR()
+BM_THUNAR_PLUGIN_TPA()
BM_THUNAR_PLUGIN_UCA()
AC_OUTPUT([
@@ -412,6 +450,7 @@ plugins/Makefile
plugins/thunar-apr/Makefile
plugins/thunar-sbr/Makefile
plugins/thunar-sendto-email/Makefile
+plugins/thunar-tpa/Makefile
plugins/thunar-uca/Makefile
po/Makefile.in
po-doc/Makefile
@@ -434,6 +473,7 @@ dnl ***************************
echo
echo "Build Configuration:"
echo
+echo "* Operating system support: $ac_bm_thunar_vfs_os_impl"
if test x"$DBUS_FOUND" = x"yes"; then
echo "* D-BUS support: yes"
else
@@ -456,5 +496,6 @@ echo "Additional Plugins:"
echo
echo "* Advanced Properties: $ac_bm_thunar_plugin_apr"
echo "* Simple Builting Renamers: $ac_bm_thunar_plugin_sbr"
+echo "* Trash Panel Applet: $ac_bm_thunar_plugin_tpa"
echo "* User Customizable Actions: $ac_bm_thunar_plugin_uca"
echo
diff --git a/docs/README.thunarrc b/docs/README.thunarrc
index 23d717490d3b61c00bc03c9821268b36480e0923..1b63ce04d8c1bcd60c70196da72f0a895ea8dc0f 100644
--- a/docs/README.thunarrc
+++ b/docs/README.thunarrc
@@ -145,7 +145,7 @@ The Thunar Configuration File (thunarrc)
* MiscCaseSensitive (FALSE/TRUE)
Determines whether the sorting should be done in a case-sensitive
- manner.
+ manner. The default is FALSE.
* MiscFoldersFirst (FALSE/TRUE)
diff --git a/docs/reference/thunar-vfs/thunar-vfs-sections.txt b/docs/reference/thunar-vfs/thunar-vfs-sections.txt
index 91556920a175e6cb1059a709b6e85d86fa3fb66a..3be625942522d4825ff8a1f8d984828c1df6f8f0 100644
--- a/docs/reference/thunar-vfs/thunar-vfs-sections.txt
+++ b/docs/reference/thunar-vfs/thunar-vfs-sections.txt
@@ -297,6 +297,8 @@ thunar_vfs_file_flags_get_type
<FILE>thunar-vfs-path</FILE>
<TITLE>ThunarVfsPath</TITLE>
ThunarVfsPath
+THUNAR_VFS_TYPE_PATH
+THUNAR_VFS_TYPE_PATH_LIST
thunar_vfs_path_new
thunar_vfs_path_get_for_home
thunar_vfs_path_get_for_root
@@ -320,10 +322,9 @@ thunar_vfs_path_list_append
thunar_vfs_path_list_prepend
thunar_vfs_path_list_copy
thunar_vfs_path_list_free
-<SUBSECTION Standard>
-THUNAR_VFS_TYPE_PATH
<SUBSECTION Private>
thunar_vfs_path_get_type
+thunar_vfs_path_list_get_type
</SECTION>
diff --git a/docs/reference/thunar-vfs/tmpl/thunar-vfs-interactive-job.sgml b/docs/reference/thunar-vfs/tmpl/thunar-vfs-interactive-job.sgml
index 63b807954dd9435ff1f7e573da77d051593bb4d0..80f8f14b84e9fed0254779725b219bff1cc3bf6e 100644
--- a/docs/reference/thunar-vfs/tmpl/thunar-vfs-interactive-job.sgml
+++ b/docs/reference/thunar-vfs/tmpl/thunar-vfs-interactive-job.sgml
@@ -33,37 +33,3 @@ ThunarVfsInteractiveJob
</para>
-<!-- ##### SIGNAL ThunarVfsInteractiveJob::ask ##### -->
-<para>
-
-</para>
-
-@thunarvfsinteractivejob: the object which received the signal.
-@arg1:
-@arg2:
-@Returns:
-
-<!-- ##### SIGNAL ThunarVfsInteractiveJob::info-message ##### -->
-<para>
-
-</para>
-
-@thunarvfsinteractivejob: the object which received the signal.
-@arg1:
-
-<!-- ##### SIGNAL ThunarVfsInteractiveJob::new-files ##### -->
-<para>
-
-</para>
-
-@thunarvfsinteractivejob: the object which received the signal.
-@arg1:
-
-<!-- ##### SIGNAL ThunarVfsInteractiveJob::percent ##### -->
-<para>
-
-</para>
-
-@thunarvfsinteractivejob: the object which received the signal.
-@arg1:
-
diff --git a/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml b/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml
index 64eae96f1e542802ede86be42208f0acce312780..fedf5bdbbd236ca335fb39308ace84804e271f28 100644
--- a/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml
+++ b/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml
@@ -23,6 +23,16 @@ ThunarVfsJob
</para>
+<!-- ##### SIGNAL ThunarVfsJob::ask ##### -->
+<para>
+
+</para>
+
+@thunarvfsjob: the object which received the signal.
+@arg1:
+@arg2:
+@Returns:
+
<!-- ##### SIGNAL ThunarVfsJob::error ##### -->
<para>
@@ -38,60 +48,62 @@ ThunarVfsJob
@thunarvfsjob: the object which received the signal.
-<!-- ##### FUNCTION thunar_vfs_job_launch ##### -->
+<!-- ##### SIGNAL ThunarVfsJob::info-message ##### -->
<para>
</para>
-@job:
-@Returns:
-
+@thunarvfsjob: the object which received the signal.
+@arg1:
-<!-- ##### FUNCTION thunar_vfs_job_cancel ##### -->
+<!-- ##### SIGNAL ThunarVfsJob::infos-ready ##### -->
<para>
</para>
-@job:
-
+@thunarvfsjob: the object which received the signal.
+@arg1:
+@Returns:
-<!-- ##### FUNCTION thunar_vfs_job_cancelled ##### -->
+<!-- ##### SIGNAL ThunarVfsJob::new-files ##### -->
<para>
</para>
-@job:
-@Returns:
+@thunarvfsjob: the object which received the signal.
+@arg1:
+
+<!-- ##### SIGNAL ThunarVfsJob::percent ##### -->
+<para>
+</para>
-<!-- ##### FUNCTION thunar_vfs_job_emit_valist ##### -->
+@thunarvfsjob: the object which received the signal.
+@arg1:
+
+<!-- ##### FUNCTION thunar_vfs_job_launch ##### -->
<para>
</para>
@job:
-@signal_id:
-@signal_detail:
-@var_args:
+@Returns:
-<!-- ##### FUNCTION thunar_vfs_job_emit ##### -->
+<!-- ##### FUNCTION thunar_vfs_job_cancel ##### -->
<para>
</para>
@job:
-@signal_id:
-@signal_detail:
-@Varargs:
-<!-- ##### FUNCTION thunar_vfs_job_error ##### -->
+<!-- ##### FUNCTION thunar_vfs_job_cancelled ##### -->
<para>
</para>
@job:
-@error:
+@Returns:
diff --git a/docs/reference/thunar-vfs/tmpl/thunar-vfs-path.sgml b/docs/reference/thunar-vfs/tmpl/thunar-vfs-path.sgml
index 0c91e269c90902234ff067d0771a26bd31b48760..038526d93cc9139def9583bc6ecbd09e7d3a7112 100644
--- a/docs/reference/thunar-vfs/tmpl/thunar-vfs-path.sgml
+++ b/docs/reference/thunar-vfs/tmpl/thunar-vfs-path.sgml
@@ -23,6 +23,20 @@ ThunarVfsPath
</para>
+<!-- ##### MACRO THUNAR_VFS_TYPE_PATH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO THUNAR_VFS_TYPE_PATH_LIST ##### -->
+<para>
+
+</para>
+
+
+
<!-- ##### FUNCTION thunar_vfs_path_new ##### -->
<para>
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 8d4aa85e19ed26d3e3dfa835e79bbb20a644855f..f9f06c6a47d03160be1a30941af29293ce4fadc2 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -8,6 +8,10 @@ if THUNAR_PLUGIN_SBR
THUNAR_SBR_SUBDIRS = thunar-sbr
endif
+if THUNAR_PLUGIN_TPA
+THUNAR_TPA_SUBDIRS = thunar-tpa
+endif
+
if THUNAR_PLUGIN_UCA
THUNAR_UCA_SUBDIRS = thunar-uca
endif
@@ -15,6 +19,7 @@ endif
SUBDIRS = \
$(THUNAR_APR_SUBDIRS) \
$(THUNAR_SBR_SUBDIRS) \
+ $(THUNAR_TPA_SUBDIRS) \
$(THUNAR_UCA_SUBDIRS) \
thunar-sendto-email
diff --git a/plugins/thunar-apr/thunar-apr-provider.c b/plugins/thunar-apr/thunar-apr-provider.c
index ef2c44a234fcd4eb45030ec5a18749ea3446e711..cd3b15dab0903a78132e0fd00dc7d0c21f53aca2 100644
--- a/plugins/thunar-apr/thunar-apr-provider.c
+++ b/plugins/thunar-apr/thunar-apr-provider.c
@@ -22,6 +22,13 @@
#include <config.h>
#endif
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
#include <thunar-apr/thunar-apr-desktop-page.h>
#include <thunar-apr/thunar-apr-image-page.h>
#include <thunar-apr/thunar-apr-provider.h>
@@ -85,6 +92,7 @@ thunar_apr_provider_get_pages (ThunarxPropertyPageProvider *property_page_provid
GSList *formats;
GSList *lp;
gchar **mime_types;
+ gchar *scheme;
GList *pages = NULL;
gint n;
@@ -92,30 +100,36 @@ thunar_apr_provider_get_pages (ThunarxPropertyPageProvider *property_page_provid
if (G_UNLIKELY (files == NULL || files->next != NULL))
return NULL;
- /* ThunarAprDesktopPage case */
- if (G_LIKELY (pages == NULL))
+ /* determine the URI scheme of the file (works only for local files) */
+ scheme = thunarx_file_info_get_uri_scheme (files->data);
+ if (G_LIKELY (strcmp (scheme, "file") == 0))
{
- /* check if we have a .desktop file here */
- if (thunarx_file_info_has_mime_type (files->data, "application/x-desktop"))
- pages = g_list_append (pages, g_object_new (THUNAR_APR_TYPE_DESKTOP_PAGE, "file", files->data, NULL));
- }
+ /* ThunarAprDesktopPage case */
+ if (G_LIKELY (pages == NULL))
+ {
+ /* check if we have a .desktop file here */
+ if (thunarx_file_info_has_mime_type (files->data, "application/x-desktop"))
+ pages = g_list_append (pages, g_object_new (THUNAR_APR_TYPE_DESKTOP_PAGE, "file", files->data, NULL));
+ }
- /* ThunarAprImagePage case */
- if (G_LIKELY (pages == NULL))
- {
- /* determine the supported GdkPixbuf formats */
- formats = gdk_pixbuf_get_formats ();
- for (lp = formats; lp != NULL && pages == NULL; lp = lp->next)
+ /* ThunarAprImagePage case */
+ if (G_LIKELY (pages == NULL))
{
- /* check if any of the mime types of this format matches */
- mime_types = gdk_pixbuf_format_get_mime_types (lp->data);
- for (n = 0; mime_types[n] != NULL && pages == NULL; ++n)
- if (thunarx_file_info_has_mime_type (files->data, mime_types[n]))
- pages = g_list_append (pages, g_object_new (THUNAR_APR_TYPE_IMAGE_PAGE, "file", files->data, NULL));
- g_strfreev (mime_types);
+ /* determine the supported GdkPixbuf formats */
+ formats = gdk_pixbuf_get_formats ();
+ for (lp = formats; lp != NULL && pages == NULL; lp = lp->next)
+ {
+ /* check if any of the mime types of this format matches */
+ mime_types = gdk_pixbuf_format_get_mime_types (lp->data);
+ for (n = 0; mime_types[n] != NULL && pages == NULL; ++n)
+ if (thunarx_file_info_has_mime_type (files->data, mime_types[n]))
+ pages = g_list_append (pages, g_object_new (THUNAR_APR_TYPE_IMAGE_PAGE, "file", files->data, NULL));
+ g_strfreev (mime_types);
+ }
+ g_slist_free (formats);
}
- g_slist_free (formats);
}
+ g_free (scheme);
return pages;
}
diff --git a/plugins/thunar-tpa/Makefile.am b/plugins/thunar-tpa/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..df6ca45378fbaa6e09ccafc0cf6ea8ecc1167c0f
--- /dev/null
+++ b/plugins/thunar-tpa/Makefile.am
@@ -0,0 +1,63 @@
+# $Id$
+
+INCLUDES = \
+ -I$(top_builddir) \
+ -I$(top_builddir)/plugins \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/plugins \
+ -DEXO_API_SUBJECT_TO_CHANGE \
+ -DG_LOG_DOMAIN=\"thunar-tpa\" \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ $(PLATFORM_CPPFLAGS)
+
+pluginsdir = $(libexecdir)/xfce4/panel-plugins
+plugins_PROGRAMS = \
+ thunar-tpa
+
+thunar_tpa_SOURCES = \
+ main.c \
+ thunar-tpa-bindings.h \
+ thunar-tpa-icon.c \
+ thunar-tpa-icon.h
+
+thunar_tpa_CFLAGS = \
+ $(DBUS_CFLAGS) \
+ $(EXO_CFLAGS) \
+ $(LIBXFCE4PANEL_CFLAGS) \
+ $(PLATFORM_CFLAGS)
+
+thunar_tpa_LDADD = \
+ $(DBUS_LIBS) \
+ $(EXO_LIBS) \
+ $(LIBXFCE4PANEL_LIBS) \
+ $(PLATFORM_LDFLAGS)
+
+if MAINTAINER_MODE
+BUILT_SOURCES = \
+ thunar-tpa-bindings.h
+
+DISTCLEANFILES = \
+ thunar-tpa-bindings.h
+
+thunar-tpa-bindings.h: $(srcdir)/thunar-tpa-bindings.xml Makefile
+ dbus-binding-tool --mode=glib-client $(srcdir)/thunar-tpa-bindings.xml > thunar-tpa-bindings.h
+endif
+
+desktopdir = $(datadir)/xfce4/panel-plugins
+desktop_in_in_files = thunar-tpa.desktop.in.in
+desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+%.desktop.in: %.desktop.in.in
+ sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+EXTRA_DIST = \
+ $(desktop_in_in_files) \
+ thunar-tpa-bindings.xml \
+ README
+
+CLEANFILES = \
+ $(desktop_in_files) \
+ $(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/thunar-tpa/README b/plugins/thunar-tpa/README
new file mode 100644
index 0000000000000000000000000000000000000000..319df84216f784bfc952c172f47ca2a4fdb2ad46
--- /dev/null
+++ b/plugins/thunar-tpa/README
@@ -0,0 +1,30 @@
+Thunar Trash Panel Applet (thunar-tpa)
+======================================
+
+Thunar-tpa is an extension for the Xfce Panel, which enables users to add a
+trash can to their panel, that
+
+ * displays the current state of the trash can
+ * can move files to the trash by dropping them on the trash icon
+ * can empty the trash can
+ * can open the trash can
+
+In order to build and install this plugin, you will need to have the xfce4-panel
+development headers and libraries installed (the appropriate package is usually
+called xfce4-panel-dev or xfce4-panel-devel). In addition, you'll need to have
+D-BUS 0.34 or above installed and Thunar must be built with D-BUS support.
+
+
+How does it work?
+=================
+
+To avoid running several desktop processes that all monitor and manage the
+trash can by itself, and thereby create an unnecessary maintaince and resource
+overhead, the trash applet simply connects to Thunar via D-BUS to query the
+state of the trash and send commands to the Trash.
+
+The trash applet is not limited to Thunar, but can work with any file manager
+that implements the org.xfce.Trash interface and owns the org.xfce.FileManager
+service. See the thunar-tpa-bindings.xml file for a details about the inter-
+face.
+
diff --git a/plugins/thunar-tpa/main.c b/plugins/thunar-tpa/main.c
new file mode 100644
index 0000000000000000000000000000000000000000..d7a5adf7174b22f06f259be120c8130c50a82d1e
--- /dev/null
+++ b/plugins/thunar-tpa/main.c
@@ -0,0 +1,61 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * 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, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar-tpa/thunar-tpa-icon.h>
+
+#include <libxfce4panel/xfce-panel-plugin.h>
+
+
+
+static void thunar_tpa_construct (XfcePanelPlugin *panel_plugin);
+
+
+
+static void
+thunar_tpa_construct (XfcePanelPlugin *panel_plugin)
+{
+ GtkWidget *icon;
+ GtkWidget *item;
+
+ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
+ /* setup the trash icon */
+ icon = thunar_tpa_icon_new ();
+ gtk_container_add (GTK_CONTAINER (panel_plugin), icon);
+ xfce_panel_plugin_add_action_widget (panel_plugin, gtk_bin_get_child (GTK_BIN (icon)));
+ gtk_widget_show (icon);
+
+ /* add the "Empty Trash" menu item */
+ item = gtk_menu_item_new_with_mnemonic (_("_Empty Trash"));
+ exo_binding_new (G_OBJECT (icon), "full", G_OBJECT (item), "sensitive");
+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tpa_icon_empty_trash), icon);
+ xfce_panel_plugin_menu_insert_item (panel_plugin, GTK_MENU_ITEM (item));
+ gtk_widget_show (item);
+
+ /* configure the plugin */
+ g_signal_connect_swapped (G_OBJECT (panel_plugin), "size-changed", G_CALLBACK (thunar_tpa_icon_set_size), icon);
+}
+
+
+
+XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (thunar_tpa_construct);
diff --git a/plugins/thunar-tpa/thunar-tpa-bindings.xml b/plugins/thunar-tpa/thunar-tpa-bindings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..505809f75691e1187b68da8d58d0626b09ed4d08
--- /dev/null
+++ b/plugins/thunar-tpa/thunar-tpa-bindings.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ $Id$
+
+ Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+
+ 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, write to the Free Software Foundation, Inc., 59 Temple
+ Place, Suite 330, Boston, MA 02111-1307 USA
+-->
+
+<node name="/org/xfce/FileManager">
+ <!--
+ org.xfce.Trash
+
+ The generic Xfce Trash Bin interface, implemented by all Xfce File
+ Managers that support a trash bin.
+ -->
+ <interface name="org.xfce.Trash">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="thunar_dbus_service" />
+
+ <!--
+ DisplayTrash (display : STRING) : VOID
+
+ display : the screen on which to display the trash folder
+ contents or "" to use the default screen of the
+ file manager.
+
+ Opens a new file manager window showing the trash folder
+ contents.
+ -->
+ <method name="DisplayTrash">
+ <arg direction="in" name="display" type="s" />
+ </method>
+
+ <!--
+ EmptyTrash (display : STRING) : VOID
+
+ display : the screen on which to display the confirmation of
+ the operation and the progress status or "" to use
+ the default screen of the file manager.
+
+ Tells the file manager to empty the trash bin.
+ -->
+ <method name="EmptyTrash">
+ <arg direction="in" name="display" type="s" />
+ </method>
+
+ <!--
+ MoveToTrash (uris : ARRAY OF STRING, display : STRING) : VOID
+
+ filenames : an array of file:-URIs or absolute paths for the files
+ that should be moved to the trash can.
+ display : the screen on which to display the progress dialog
+ and possible error messages and confirmation dialogs
+ or "" to use the default screen of the file manager.
+
+ Tells the file manager to move all files specified by the filenames
+ to the trash bin.
+ -->
+ <method name="MoveToTrash">
+ <arg direction="in" name="filenames" type="as" />
+ <arg direction="in" name="display" type="s" />
+ </method>
+
+ <!--
+ QueryTrash () : BOOLEAN
+
+ Determines whether the trash bin contains atleast one
+ item.
+
+ Returns: TRUE if the trash bin is not empty, FALSE otherwise.
+ -->
+ <method name="QueryTrash">
+ <arg direction="out" name="full" type="b" />
+ </method>
+
+ <!--
+ TrashChanged (full : BOOLEAN)
+
+ full : TRUE if the trash now contains atleast one item.
+
+ This signal is emitted by the file manager whenever the state
+ of the trash bin changes.
+ -->
+ <signal name="TrashChanged" />
+ </interface>
+</node>
+
+<!-- vi:set ts=2 sw=2 et ai: -->
diff --git a/plugins/thunar-tpa/thunar-tpa-icon.c b/plugins/thunar-tpa/thunar-tpa-icon.c
new file mode 100644
index 0000000000000000000000000000000000000000..569eae5883cc7d61677f31bc0896f2d9abe6c3f5
--- /dev/null
+++ b/plugins/thunar-tpa/thunar-tpa-icon.c
@@ -0,0 +1,686 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * 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, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar-tpa/thunar-tpa-bindings.h>
+#include <thunar-tpa/thunar-tpa-icon.h>
+
+#include <libxfce4panel/xfce-panel-convenience.h>
+
+
+
+/* Property identifiers */
+enum
+{
+ PROP_0,
+ PROP_FULL,
+};
+
+/* Identifiers for DnD target ypes */
+enum
+{
+ TARGET_TEXT_URI_LIST,
+};
+
+
+
+static void thunar_tpa_icon_class_init (ThunarTpaIconClass *klass);
+static void thunar_tpa_icon_init (ThunarTpaIcon *icon);
+static void thunar_tpa_icon_finalize (GObject *object);
+static void thunar_tpa_icon_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void thunar_tpa_icon_error (ThunarTpaIcon *icon,
+ GError *error);
+static void thunar_tpa_icon_state (ThunarTpaIcon *icon,
+ gboolean full);
+static void thunar_tpa_icon_display_trash_reply (DBusGProxy *proxy,
+ GError *error,
+ gpointer user_data);
+static void thunar_tpa_icon_empty_trash_reply (DBusGProxy *proxy,
+ GError *error,
+ gpointer user_data);
+static void thunar_tpa_icon_move_to_trash_reply (DBusGProxy *proxy,
+ GError *error,
+ gpointer user_data);
+static void thunar_tpa_icon_query_trash_reply (DBusGProxy *proxy,
+ gboolean full,
+ GError *error,
+ gpointer user_data);
+static void thunar_tpa_icon_clicked (GtkWidget *button,
+ ThunarTpaIcon *icon);
+static void thunar_tpa_icon_drag_data_received (GtkWidget *button,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ ThunarTpaIcon *icon);
+static gboolean thunar_tpa_icon_enter_notify_event (GtkWidget *button,
+ GdkEventCrossing *event,
+ ThunarTpaIcon *icon);
+static gboolean thunar_tpa_icon_leave_notify_event (GtkWidget *button,
+ GdkEventCrossing *event,
+ ThunarTpaIcon *icon);
+static void thunar_tpa_icon_trash_changed (DBusGProxy *proxy,
+ gboolean full,
+ ThunarTpaIcon *icon);
+
+
+
+struct _ThunarTpaIconClass
+{
+ GtkAlignmentClass __parent__;
+};
+
+struct _ThunarTpaIcon
+{
+ GtkAlignment __parent__;
+
+ gboolean full;
+
+ GtkTooltips *tooltips;
+ GtkWidget *button;
+ GtkWidget *image;
+
+ DBusGProxy *proxy;
+ DBusGProxyCall *display_trash_call;
+ DBusGProxyCall *empty_trash_call;
+ DBusGProxyCall *move_to_trash_call;
+ DBusGProxyCall *query_trash_call;
+};
+
+
+
+/* Target types for dropping to the trash can */
+static const GtkTargetEntry drop_targets[] =
+{
+ { "text/uri-list", 0, TARGET_TEXT_URI_LIST, },
+};
+
+
+
+G_DEFINE_TYPE (ThunarTpaIcon, thunar_tpa_icon, GTK_TYPE_ALIGNMENT);
+
+
+
+static void
+thunar_tpa_icon_class_init (ThunarTpaIconClass *klass)
+{
+ GObjectClass *gobject_class;
+
+ gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class->finalize = thunar_tpa_icon_finalize;
+ gobject_class->get_property = thunar_tpa_icon_get_property;
+
+ /**
+ * ThunarTpaIcon:full:
+ *
+ * The current state of the trash can.
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_FULL,
+ g_param_spec_boolean ("full",
+ "full",
+ "full",
+ FALSE,
+ EXO_PARAM_READABLE));
+}
+
+
+
+static void
+thunar_tpa_icon_init (ThunarTpaIcon *icon)
+{
+ DBusGConnection *connection;
+ GError *err = NULL;
+
+ gtk_alignment_set (GTK_ALIGNMENT (icon), 0.5f, 0.5f, 1.0f, 1.0f);
+
+ /* allocate the shared tooltips */
+ icon->tooltips = gtk_tooltips_new ();
+ g_object_ref (G_OBJECT (icon->tooltips));
+ gtk_object_sink (GTK_OBJECT (icon->tooltips));
+
+ /* setup the button for the trash icon */
+ icon->button = xfce_create_panel_button ();
+ GTK_WIDGET_UNSET_FLAGS (icon->button, GTK_CAN_DEFAULT);
+ gtk_drag_dest_set (icon->button, GTK_DEST_DEFAULT_ALL, drop_targets, G_N_ELEMENTS (drop_targets), GDK_ACTION_MOVE);
+ g_signal_connect (G_OBJECT (icon->button), "clicked", G_CALLBACK (thunar_tpa_icon_clicked), icon);
+ g_signal_connect (G_OBJECT (icon->button), "drag-data-received", G_CALLBACK (thunar_tpa_icon_drag_data_received), icon);
+ g_signal_connect (G_OBJECT (icon->button), "enter-notify-event", G_CALLBACK (thunar_tpa_icon_enter_notify_event), icon);
+ g_signal_connect (G_OBJECT (icon->button), "leave-notify-event", G_CALLBACK (thunar_tpa_icon_leave_notify_event), icon);
+ gtk_container_add (GTK_CONTAINER (icon), icon->button);
+ gtk_widget_show (icon->button);
+
+ /* setup the image for the trash icon */
+ icon->image = gtk_image_new_from_icon_name ("gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON);
+ gtk_container_add (GTK_CONTAINER (icon->button), icon->image);
+ gtk_widget_show (icon->image);
+
+ /* try to connect to the D-BUS session daemon */
+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, &err);
+ if (G_UNLIKELY (connection == NULL))
+ {
+ /* we failed to connect, display an error icon/tooltip */
+ thunar_tpa_icon_error (icon, err);
+ g_error_free (err);
+ }
+ else
+ {
+ /* grab a proxy for the /org/xfce/FileManager object on org.xfce.FileManager */
+ icon->proxy = dbus_g_proxy_new_for_name (connection, "org.xfce.FileManager", "/org/xfce/FileManager", "org.xfce.Trash");
+
+ /* connect to the "TrashChanged" signal */
+ dbus_g_proxy_add_signal (icon->proxy, "TrashChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal (icon->proxy, "TrashChanged", G_CALLBACK (thunar_tpa_icon_trash_changed), icon, NULL);
+
+ /* update the state of the trash icon */
+ thunar_tpa_icon_query_trash (icon);
+ }
+}
+
+
+
+static void
+thunar_tpa_icon_finalize (GObject *object)
+{
+ ThunarTpaIcon *icon = THUNAR_TPA_ICON (object);
+
+ /* release the proxy object */
+ if (G_LIKELY (icon->proxy != NULL))
+ {
+ /* cancel any pending calls */
+ if (G_UNLIKELY (icon->display_trash_call != NULL))
+ dbus_g_proxy_cancel_call (icon->proxy, icon->display_trash_call);
+ if (G_UNLIKELY (icon->empty_trash_call != NULL))
+ dbus_g_proxy_cancel_call (icon->proxy, icon->empty_trash_call);
+ if (G_UNLIKELY (icon->move_to_trash_call != NULL))
+ dbus_g_proxy_cancel_call (icon->proxy, icon->move_to_trash_call);
+ if (G_UNLIKELY (icon->query_trash_call != NULL))
+ dbus_g_proxy_cancel_call (icon->proxy, icon->query_trash_call);
+
+ /* disconnect the signal and release the proxy */
+ dbus_g_proxy_disconnect_signal (icon->proxy, "TrashChanged", G_CALLBACK (thunar_tpa_icon_trash_changed), icon);
+ g_object_unref (G_OBJECT (icon->proxy));
+ }
+
+ /* release the shared tooltips */
+ g_object_unref (G_OBJECT (icon->tooltips));
+
+ (*G_OBJECT_CLASS (thunar_tpa_icon_parent_class)->finalize) (object);
+}
+
+
+
+static void
+thunar_tpa_icon_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ ThunarTpaIcon *icon = THUNAR_TPA_ICON (object);
+
+ switch (prop_id)
+ {
+ case PROP_FULL:
+ g_value_set_boolean (value, icon->full);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+
+
+static void
+thunar_tpa_icon_error (ThunarTpaIcon *icon,
+ GError *error)
+{
+ gchar *tooltip;
+
+ /* reset to empty first */
+ thunar_tpa_icon_state (icon, FALSE);
+
+ /* strip off additional whitespace */
+ g_strstrip (error->message);
+
+ /* tell the user that we failed to connect to the trash */
+ tooltip = g_strdup_printf ("%s: %s.", _("Failed to connect to the Trash"), error->message);
+ gtk_tooltips_set_tip (icon->tooltips, icon->button, tooltip, NULL);
+ g_free (tooltip);
+
+ /* setup an error icon */
+ gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), "stock_dialog-error", GTK_ICON_SIZE_BUTTON);
+}
+
+
+
+static void
+thunar_tpa_icon_state (ThunarTpaIcon *icon,
+ gboolean full)
+{
+ /* tell the user whether the trash is full or empty */
+ gtk_tooltips_set_tip (icon->tooltips, icon->button, full ? _("Trash is full") : _("Trash is empty"), NULL);
+
+ /* setup the appropriate icon */
+ gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "gnome-fs-trash-full" : "gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON);
+
+ /* apply the new state */
+ icon->full = full;
+ g_object_notify (G_OBJECT (icon), "full");
+}
+
+
+
+static void
+thunar_tpa_icon_display_trash_reply (DBusGProxy *proxy,
+ GError *error,
+ gpointer user_data)
+{
+ ThunarTpaIcon *icon = THUNAR_TPA_ICON (user_data);
+ GtkWidget *message;
+
+ /* reset the call */
+ icon->display_trash_call = NULL;
+
+ /* check if we failed */
+ if (G_UNLIKELY (error != NULL))
+ {
+ /* strip off additional whitespace */
+ g_strstrip (error->message);
+
+ /* display an error message to the user */
+ message = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s.", _("Failed to connect to the Trash"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s.", error->message);
+ gtk_window_set_screen (GTK_WINDOW (message), gtk_widget_get_screen (GTK_WIDGET (icon)));
+ gtk_dialog_run (GTK_DIALOG (message));
+ gtk_widget_destroy (message);
+ g_error_free (error);
+ }
+}
+
+
+
+static void
+thunar_tpa_icon_empty_trash_reply (DBusGProxy *proxy,
+ GError *error,
+ gpointer user_data)
+{
+ ThunarTpaIcon *icon = THUNAR_TPA_ICON (user_data);
+ GtkWidget *message;
+
+ /* reset the call */
+ icon->empty_trash_call = NULL;
+
+ /* check if we failed */
+ if (G_UNLIKELY (error != NULL))
+ {
+ /* strip off additional whitespace */
+ g_strstrip (error->message);
+
+ /* display an error message to the user */
+ message = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s.", _("Failed to connect to the Trash"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s.", error->message);
+ gtk_window_set_screen (GTK_WINDOW (message), gtk_widget_get_screen (GTK_WIDGET (icon)));
+ gtk_dialog_run (GTK_DIALOG (message));
+ gtk_widget_destroy (message);
+ g_error_free (error);
+ }
+ else
+ {
+ /* query the new state of the trash */
+ thunar_tpa_icon_query_trash (icon);
+ }
+}
+
+
+
+static void
+thunar_tpa_icon_move_to_trash_reply (DBusGProxy *proxy,
+ GError *error,
+ gpointer user_data)
+{
+ ThunarTpaIcon *icon = THUNAR_TPA_ICON (user_data);
+ GtkWidget *message;
+
+ /* reset the call */
+ icon->move_to_trash_call = NULL;
+
+ /* check if we failed */
+ if (G_UNLIKELY (error != NULL))
+ {
+ /* strip off additional whitespace */
+ g_strstrip (error->message);
+
+ /* display an error message to the user */
+ message = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s.", _("Failed to connect to the Trash"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s.", error->message);
+ gtk_window_set_screen (GTK_WINDOW (message), gtk_widget_get_screen (GTK_WIDGET (icon)));
+ gtk_dialog_run (GTK_DIALOG (message));
+ gtk_widget_destroy (message);
+ g_error_free (error);
+ }
+ else
+ {
+ /* query the new state of the trash */
+ thunar_tpa_icon_query_trash (icon);
+ }
+}
+
+
+
+static void
+thunar_tpa_icon_query_trash_reply (DBusGProxy *proxy,
+ gboolean full,
+ GError *error,
+ gpointer user_data)
+{
+ ThunarTpaIcon *icon = THUNAR_TPA_ICON (user_data);
+
+ /* reset the call */
+ icon->query_trash_call = NULL;
+
+ /* check if we failed */
+ if (G_UNLIKELY (error != NULL))
+ {
+ /* setup an error tooltip/icon */
+ thunar_tpa_icon_error (icon, error);
+ g_error_free (error);
+ }
+ else
+ {
+ /* update the tooltip/icon accordingly */
+ thunar_tpa_icon_state (icon, full);
+ }
+}
+
+
+
+static void
+thunar_tpa_icon_clicked (GtkWidget *button,
+ ThunarTpaIcon *icon)
+{
+ g_return_if_fail (THUNAR_TPA_IS_ICON (icon));
+ g_return_if_fail (icon->button == button);
+
+ /* display the trash folder */
+ thunar_tpa_icon_display_trash (icon);
+}
+
+
+
+static void
+thunar_tpa_icon_drag_data_received (GtkWidget *button,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ ThunarTpaIcon *icon)
+{
+ gboolean succeed = FALSE;
+ gchar **uri_list;
+
+ g_return_if_fail (THUNAR_TPA_IS_ICON (icon));
+ g_return_if_fail (icon->button == button);
+
+ /* determine the type of drop we received */
+ if (G_LIKELY (info == TARGET_TEXT_URI_LIST))
+ {
+ /* check if the data is valid for text/uri-list */
+ if (G_LIKELY (selection_data->length >= 0 && selection_data->format == 8))
+ {
+ /* parse the URI list according to RFC 2483 */
+ uri_list = g_uri_list_extract_uris ((const gchar *) selection_data->data);
+ succeed = thunar_tpa_icon_move_to_trash (icon, (const gchar **) uri_list);
+ g_strfreev (uri_list);
+ }
+ }
+
+ /* finish the drag */
+ gtk_drag_finish (context, succeed, TRUE, time);
+}
+
+
+
+static gboolean
+thunar_tpa_icon_enter_notify_event (GtkWidget *button,
+ GdkEventCrossing *event,
+ ThunarTpaIcon *icon)
+{
+ g_return_val_if_fail (THUNAR_TPA_IS_ICON (icon), FALSE);
+ g_return_val_if_fail (icon->button == button, FALSE);
+
+ /* query the new state of the trash */
+ thunar_tpa_icon_query_trash (icon);
+
+ return FALSE;
+}
+
+
+
+static gboolean
+thunar_tpa_icon_leave_notify_event (GtkWidget *button,
+ GdkEventCrossing *event,
+ ThunarTpaIcon *icon)
+{
+ g_return_val_if_fail (THUNAR_TPA_IS_ICON (icon), FALSE);
+ g_return_val_if_fail (icon->button == button, FALSE);
+
+ /* query the new state of the trash */
+ thunar_tpa_icon_query_trash (icon);
+
+ return FALSE;
+}
+
+
+
+static void
+thunar_tpa_icon_trash_changed (DBusGProxy *proxy,
+ gboolean full,
+ ThunarTpaIcon *icon)
+{
+ g_return_if_fail (THUNAR_TPA_IS_ICON (icon));
+ g_return_if_fail (icon->proxy == proxy);
+
+ /* change the status icon/tooltip appropriately */
+ thunar_tpa_icon_state (icon, full);
+}
+
+
+
+/**
+ * thunar_tpa_icon_new:
+ *
+ * Allocates a new #ThunarTpaIcon instance.
+ *
+ * Return value: the newly allocated #ThunarTpaIcon.
+ **/
+GtkWidget*
+thunar_tpa_icon_new (void)
+{
+ return g_object_new (THUNAR_TPA_TYPE_ICON, NULL);
+}
+
+
+
+/**
+ * thunar_tpa_icon_set_size:
+ * @icon : a #ThunarTpaIcon.
+ * @size : the new width and height for the @icon.
+ *
+ * Sets the width and height for the @icon to the specified
+ * @size.
+ **/
+void
+thunar_tpa_icon_set_size (ThunarTpaIcon *icon,
+ gint size)
+{
+ gint focus_line_width;
+ gint focus_padding;
+ gint pixel_size = size;
+
+ g_return_if_fail (THUNAR_TPA_IS_ICON (icon));
+ g_return_if_fail (size > 0);
+
+ /* determine the style properties affecting the button size */
+ gtk_widget_style_get (GTK_WIDGET (icon->button),
+ "focus-line-width", &focus_line_width,
+ "focus-padding", &focus_padding,
+ NULL);
+
+ /* determine the pixel size for the image */
+ pixel_size -= 2 + 2 * (focus_line_width + focus_padding);
+ pixel_size -= GTK_CONTAINER (icon->button)->border_width * 2;
+ pixel_size -= MAX (icon->button->style->xthickness, icon->button->style->ythickness) * 2;
+
+ /* setup the pixel size for the image */
+ gtk_image_set_pixel_size (GTK_IMAGE (icon->image), pixel_size);
+}
+
+
+
+/**
+ * thunar_tpa_icon_display_trash:
+ * @icon : a #ThunarTpaIcon.
+ *
+ * Displays the trash folder.
+ **/
+void
+thunar_tpa_icon_display_trash (ThunarTpaIcon *icon)
+{
+ gchar *display_name;
+
+ g_return_if_fail (THUNAR_TPA_IS_ICON (icon));
+
+ /* check if we are connected to the bus */
+ if (G_LIKELY (icon->proxy != NULL))
+ {
+ /* cancel any pending call */
+ if (G_UNLIKELY (icon->display_trash_call != NULL))
+ dbus_g_proxy_cancel_call (icon->proxy, icon->display_trash_call);
+
+ /* schedule a new call */
+ display_name = gdk_screen_make_display_name (gtk_widget_get_screen (GTK_WIDGET (icon)));
+ icon->display_trash_call = org_xfce_Trash_display_trash_async (icon->proxy, display_name, thunar_tpa_icon_display_trash_reply, icon);
+ g_free (display_name);
+ }
+}
+
+
+
+/**
+ * thunar_tpa_icon_empty_trash:
+ * @icon : a #ThunarTpaIcon.
+ *
+ * Empties the trash can.
+ **/
+void
+thunar_tpa_icon_empty_trash (ThunarTpaIcon *icon)
+{
+ gchar *display_name;
+
+ g_return_if_fail (THUNAR_TPA_IS_ICON (icon));
+
+ /* check if we are connected to the bus */
+ if (G_LIKELY (icon->proxy != NULL))
+ {
+ /* cancel any pending call */
+ if (G_UNLIKELY (icon->empty_trash_call != NULL))
+ dbus_g_proxy_cancel_call (icon->proxy, icon->empty_trash_call);
+
+ /* schedule a new call */
+ display_name = gdk_screen_make_display_name (gtk_widget_get_screen (GTK_WIDGET (icon)));
+ icon->empty_trash_call = org_xfce_Trash_empty_trash_async (icon->proxy, display_name, thunar_tpa_icon_empty_trash_reply, icon);
+ g_free (display_name);
+ }
+}
+
+
+
+/**
+ * thunar_tpa_icon_move_to_trash:
+ * @icon : a #ThunarTpaIcon.
+ * @uri_list : the URIs of the files to move to the trash.
+ *
+ * Tells the trash to move the files in the @uri_list to the
+ * trash.
+ *
+ * Return value: %TRUE if the command was send successfully,
+ * %FALSE otherwise.
+ **/
+gboolean
+thunar_tpa_icon_move_to_trash (ThunarTpaIcon *icon,
+ const gchar **uri_list)
+{
+ gchar *display_name;
+
+ g_return_val_if_fail (THUNAR_TPA_IS_ICON (icon), FALSE);
+ g_return_val_if_fail (uri_list != NULL, FALSE);
+
+ /* check if we are connected to the bus */
+ if (G_UNLIKELY (icon->proxy == NULL))
+ return FALSE;
+
+ /* cancel any pending call */
+ if (G_UNLIKELY (icon->move_to_trash_call != NULL))
+ dbus_g_proxy_cancel_call (icon->proxy, icon->move_to_trash_call);
+
+ /* schedule a new call */
+ display_name = gdk_screen_make_display_name (gtk_widget_get_screen (GTK_WIDGET (icon)));
+ icon->move_to_trash_call = org_xfce_Trash_move_to_trash_async (icon->proxy, uri_list, display_name, thunar_tpa_icon_move_to_trash_reply, icon);
+ g_free (display_name);
+
+ return TRUE;
+}
+
+
+
+/**
+ * thunar_tpa_icon_query_trash:
+ * @icon : a #ThunarTpaIcon.
+ *
+ * Queries the state of the trash can.
+ **/
+void
+thunar_tpa_icon_query_trash (ThunarTpaIcon *icon)
+{
+ g_return_if_fail (THUNAR_TPA_IS_ICON (icon));
+
+ /* check if we are connected to the bus */
+ if (G_LIKELY (icon->proxy != NULL))
+ {
+ /* cancel any pending call */
+ if (G_UNLIKELY (icon->query_trash_call != NULL))
+ dbus_g_proxy_cancel_call (icon->proxy, icon->query_trash_call);
+
+ /* schedule a new call */
+ icon->query_trash_call = org_xfce_Trash_query_trash_async (icon->proxy, thunar_tpa_icon_query_trash_reply, icon);
+ }
+}
+
diff --git a/plugins/thunar-tpa/thunar-tpa-icon.h b/plugins/thunar-tpa/thunar-tpa-icon.h
new file mode 100644
index 0000000000000000000000000000000000000000..12e2a4a893fd168d4aed2a494afdf0b6621d9af7
--- /dev/null
+++ b/plugins/thunar-tpa/thunar-tpa-icon.h
@@ -0,0 +1,52 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * 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, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __THUNAR_TPA_ICON_H__
+#define __THUNAR_TPA_ICON_H__
+
+#include <exo/exo.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _ThunarTpaIconClass ThunarTpaIconClass;
+typedef struct _ThunarTpaIcon ThunarTpaIcon;
+
+#define THUNAR_TPA_TYPE_ICON (thunar_tpa_icon_get_type ())
+#define THUNAR_TPA_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_TPA_TYPE_ICON, ThunarTpaIcon))
+#define THUNAR_TPA_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_TPA_TYPE_ICON, ThunarTpaIconClass))
+#define THUNAR_TPA_IS_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_TPA_TYPE_ICON))
+#define THUNAR_TPA_IS_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_TPA_TYPE_ICON))
+#define THUNAR_TPA_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_TPA_TYPE_ICON, ThunarTpaIconClass))
+
+GType thunar_tpa_icon_get_type (void) G_GNUC_CONST;
+
+GtkWidget *thunar_tpa_icon_new (void) G_GNUC_MALLOC;
+
+void thunar_tpa_icon_set_size (ThunarTpaIcon *icon,
+ gint size);
+
+void thunar_tpa_icon_display_trash (ThunarTpaIcon *icon);
+void thunar_tpa_icon_empty_trash (ThunarTpaIcon *icon);
+gboolean thunar_tpa_icon_move_to_trash (ThunarTpaIcon *icon,
+ const gchar **uri_list);
+void thunar_tpa_icon_query_trash (ThunarTpaIcon *icon);
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_TPA_ICON_H__ */
diff --git a/plugins/thunar-tpa/thunar-tpa.desktop.in.in b/plugins/thunar-tpa/thunar-tpa.desktop.in.in
new file mode 100644
index 0000000000000000000000000000000000000000..6d848f632ef666af94d74f7ed9cc45fd9fdcacd0
--- /dev/null
+++ b/plugins/thunar-tpa/thunar-tpa.desktop.in.in
@@ -0,0 +1,8 @@
+[Xfce Panel]
+Type=X-XFCE-PanelPlugin
+Encoding=UTF-8
+_Name=Trash Applet
+_Comment=Display the trash can
+Icon=gnome-fs-trash-empty
+X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/thunar-tpa
+
diff --git a/plugins/thunar-uca/thunar-uca-model.c b/plugins/thunar-uca/thunar-uca-model.c
index 2df4df68b7fe3d6cb8c26041a443b9f83100214b..01eec8de9def96547561d4520c71e87022be84ec 100644
--- a/plugins/thunar-uca/thunar-uca-model.c
+++ b/plugins/thunar-uca/thunar-uca-model.c
@@ -1031,6 +1031,13 @@ thunar_uca_model_match (ThunarUcaModel *uca_model,
for (lp = file_infos, n = 0; lp != NULL; lp = lp->next, ++n)
{
info = thunarx_file_info_get_vfs_info (lp->data);
+ if (thunar_vfs_path_get_scheme (info->path) != THUNAR_VFS_PATH_SCHEME_FILE)
+ {
+ /* cannot handle non-local files */
+ thunar_vfs_info_unref (info);
+ g_free (files);
+ return NULL;
+ }
mime_type = thunar_vfs_mime_info_get_name (info->mime_info);
files[n].name = thunar_vfs_path_get_name (info->path);
files[n].types = types_from_mime_type (mime_type);
diff --git a/po/ChangeLog b/po/ChangeLog
index 986947d075441921f0ff31455dcf9ca7959508f1..c17a6b8fa8ed4579c8067fb0cb40b61d3e582250 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-27 Benedikt Meurer <benny@xfce.org>
+
+ * POTFILES.in: Add new files here.
+ * Thunar.pot, *.po: Merge new strings.
+ * de.po: Update german translations.
+
2006-07-20 Sylvain Vedrenne <gnu_sylvain@xfce.org>
* eo.po: Updated Esperanto translations from Antono Vasiljev
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7563530202fbd9f33a61b81520dcaa725cca74d4..ab62be3fcc0640333096d6f09f1196232b650b02 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,17 +1,19 @@
-thunar-vfs/thunar-vfs-chmod-job.c
-thunar-vfs/thunar-vfs-chown-job.c
-thunar-vfs/thunar-vfs-creat-job.c
thunar-vfs/thunar-vfs-config.c
thunar-vfs/thunar-vfs-deep-count-job.c
thunar-vfs/thunar-vfs-exec.c
thunar-vfs/thunar-vfs-info.c
thunar-vfs/thunar-vfs-interactive-job.c
+thunar-vfs/thunar-vfs-io-jobs.c
+thunar-vfs/thunar-vfs-io-local-xfer.c
+thunar-vfs/thunar-vfs-io-local.c
+thunar-vfs/thunar-vfs-io-ops.c
+thunar-vfs/thunar-vfs-io-scandir.c
+thunar-vfs/thunar-vfs-io-trash.c
thunar-vfs/thunar-vfs-job.c
-thunar-vfs/thunar-vfs-link-job.c
-thunar-vfs/thunar-vfs-listdir-job.c
thunar-vfs/thunar-vfs-mime-action.c
thunar-vfs/thunar-vfs-mime-application.c
thunar-vfs/thunar-vfs-mime-cache.c
+thunar-vfs/thunar-vfs-mime-cleaner.c
thunar-vfs/thunar-vfs-mime-database.c
thunar-vfs/thunar-vfs-mime-handler.c
thunar-vfs/thunar-vfs-mime-info.c
@@ -19,21 +21,23 @@ thunar-vfs/thunar-vfs-mime-legacy.c
thunar-vfs/thunar-vfs-mime-parser.c
thunar-vfs/thunar-vfs-mime-provider.c
thunar-vfs/thunar-vfs-mime-sniffer.c
-thunar-vfs/thunar-vfs-mkdir-job.c
thunar-vfs/thunar-vfs-monitor.c
+thunar-vfs/thunar-vfs-os-bsd.c
+thunar-vfs/thunar-vfs-os-generic.c
thunar-vfs/thunar-vfs-path.c
-thunar-vfs/thunar-vfs-scandir.c
+thunar-vfs/thunar-vfs-private.c
+thunar-vfs/thunar-vfs-simple-job.c
thunar-vfs/thunar-vfs-thumb-jpeg.c
+thunar-vfs/thunar-vfs-thumb-pixbuf.c
thunar-vfs/thunar-vfs-thumb.c
thunar-vfs/thunar-vfs-transfer-job.c
-thunar-vfs/thunar-vfs-unlink-job.c
thunar-vfs/thunar-vfs-user.c
thunar-vfs/thunar-vfs-util.c
thunar-vfs/thunar-vfs-volume-freebsd.c
thunar-vfs/thunar-vfs-volume-hal.c
+thunar-vfs/thunar-vfs-volume-manager.c
thunar-vfs/thunar-vfs-volume-none.c
thunar-vfs/thunar-vfs-volume.c
-thunar-vfs/thunar-vfs-xfer.c
thunar-vfs/thunar-vfs.c
thunar/main.c
@@ -95,6 +99,7 @@ thunar/thunar-thumbnail-generator.c
thunar/thunar-tree-model.c
thunar/thunar-tree-pane.c
thunar/thunar-tree-view.c
+thunar/thunar-util.c
thunar/thunar-view.c
thunar/thunar-window.c
@@ -120,6 +125,10 @@ plugins/thunar-sbr/thunar-sbr-replace-renamer.c
plugins/thunar-sendto-email/main.c
plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in
+plugins/thunar-tpa/main.c
+plugins/thunar-tpa/thunar-tpa-icon.c
+plugins/thunar-tpa/thunar-tpa.desktop.in.in
+
plugins/thunar-uca/thunar-uca-chooser.c
plugins/thunar-uca/thunar-uca-context.c
plugins/thunar-uca/thunar-uca-editor.c
@@ -131,3 +140,4 @@ plugins/thunar-uca/uca.xml.in
Thunar.desktop.in.in
Thunar-bulk-rename.desktop.in.in
Thunar-folder-handler.desktop.in.in
+
diff --git a/po/Thunar.pot b/po/Thunar.pot
index 2850e80aaec0598a01befa95ab28ea54e3ff865d..283cf474a0e66f6d48d346b929d10d3f05f6fe81 100644
--- a/po/Thunar.pot
+++ b/po/Thunar.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,360 +17,329 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr ""
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr ""
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr ""
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr ""
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr ""
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr ""
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+msgid "Only local files may be renamed"
msgstr ""
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
msgstr ""
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
#, c-format
-msgid "Failed to remove \"%s\": %s"
+msgid "Failed to change permissions of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
#, c-format
-msgid "Failed to load application from file %s"
+msgid "Failed to change file owenr of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
#, c-format
-msgid "%s document"
+msgid "Failed to change file group of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr ""
-
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
+msgid "The file \"%s\" already exists"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
+msgid "Failed to create empty file \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr ""
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
+#, c-format
+msgid "Failed to open \"%s\" for reading"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
+msgid "Failed to write data to \"%s\""
msgstr ""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
+msgid "Failed to remove \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
+msgid "Failed to read data from \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr ""
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] ""
msgstr[1] ""
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr ""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
+#, c-format
+msgid "Failed to create symbolic link \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr ""
+
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
#, c-format
-msgid "Failed to open \"%s\" for reading"
+msgid "Failed to copy \"%s\" to \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
#, c-format
-msgid "The file \"%s\" already exists"
+msgid "Failed to link \"%s\" to \"%s\""
msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
#, c-format
-msgid "Failed to open \"%s\" for writing"
+msgid "Failed to move \"%s\" to \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
#, c-format
-msgid "Failed to read data from \"%s\""
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
+msgid "Failed to load application from file %s"
msgstr ""
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
+msgid "Failed to remove \"%s\": %s"
msgstr ""
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
+msgid "%s document"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
+msgid "The URI \"%s\" is invalid"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr ""
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr ""
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
+msgid "Unknown user \"%s\""
+msgstr ""
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
msgstr ""
#: ../thunar/main.c:54
@@ -488,137 +457,215 @@ msgid "Sort items in descending order"
msgstr ""
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr ""
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr ""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr ""
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr ""
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr ""
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+msgid "Moving files into the trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr ""
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr ""
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr ""
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr ""
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+msgid "_Empty Trash"
+msgstr ""
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr ""
+
+#: ../thunar/thunar-application.c:1346
+#, c-format
+msgid "Create the folder \"%s\"?"
+msgstr ""
+
+#: ../thunar/thunar-application.c:1350
+msgid "C_reate Folder"
+msgstr ""
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, c-format
+msgid "Failed to restore \"%s\""
+msgstr ""
+
+#: ../thunar/thunar-application.c:1400
+msgid "Restoring files..."
+msgstr ""
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr ""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr ""
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
msgstr ""
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr ""
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
msgstr ""
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr ""
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr ""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr ""
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr ""
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
msgstr ""
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -627,39 +674,39 @@ msgid ""
"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr ""
@@ -679,7 +726,7 @@ msgid "Other Applications"
msgstr ""
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr ""
@@ -741,14 +788,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr ""
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr ""
@@ -760,7 +808,7 @@ msgstr ""
msgid "Compact view"
msgstr ""
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr ""
@@ -786,16 +834,32 @@ msgstr ""
msgid "Details view"
msgstr ""
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr ""
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr ""
@@ -850,7 +914,7 @@ msgstr ""
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr ""
@@ -866,14 +930,10 @@ msgstr ""
msgid "File Name"
msgstr ""
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr ""
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr ""
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -907,14 +967,14 @@ msgstr ""
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr ""
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr ""
@@ -1048,12 +1108,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr ""
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1061,111 +1121,129 @@ msgstr[0] ""
msgstr[1] ""
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr ""
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr ""
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr ""
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr ""
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr ""
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr ""
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr ""
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr ""
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr ""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr ""
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
msgstr ""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr ""
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr ""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr ""
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr ""
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr ""
@@ -1182,11 +1260,11 @@ msgstr ""
msgid "Failed to launch \"%s\""
msgstr ""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr ""
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr ""
@@ -1264,27 +1342,25 @@ msgid "Stop applying permissions recursively."
msgstr ""
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1292,114 +1368,94 @@ msgid ""
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
"folder afterwards."
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr ""
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr ""
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr ""
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr ""
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr ""
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1408,76 +1464,76 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1486,22 +1542,25 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1510,214 +1569,218 @@ msgid ""
"to select the item without activating it."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr ""
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
"folder. Select the default behavior below:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr ""
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr ""
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr ""
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+msgid "Deleted:"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr ""
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr ""
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr ""
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr ""
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr ""
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1725,49 +1788,49 @@ msgid ""
msgstr ""
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr ""
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] ""
msgstr[1] ""
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr ""
@@ -1810,267 +1873,257 @@ msgstr[0] ""
msgstr[1] ""
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr ""
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr ""
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr ""
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr ""
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr ""
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr ""
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr ""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr ""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr ""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr ""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr ""
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr ""
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr ""
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr ""
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr ""
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr ""
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr ""
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr ""
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr ""
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr ""
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
msgstr ""
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr ""
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr ""
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr ""
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr ""
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr ""
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr ""
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr ""
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr ""
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr ""
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr ""
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr ""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr ""
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr ""
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr ""
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr ""
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr ""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr ""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr ""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
+#: ../thunar/thunar-standard-view.c:3349
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] ""
msgstr[1] ""
+#: ../thunar/thunar-standard-view.c:3380
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-standard-view.c:3388
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] ""
+msgstr[1] ""
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr ""
@@ -2089,20 +2142,30 @@ msgstr ""
msgid "_Empty File"
msgstr ""
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr ""
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr ""
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr ""
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr ""
@@ -2512,23 +2575,23 @@ msgid "Shutter Speed:"
msgstr ""
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr ""
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2698,39 +2761,39 @@ msgstr ""
msgid "Search & Replace"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2740,28 +2803,28 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr ""
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr ""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2769,7 +2832,7 @@ msgstr[0] ""
msgstr[1] ""
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr ""
@@ -2777,6 +2840,32 @@ msgstr ""
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+msgid "Failed to connect to the Trash"
+msgstr ""
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr ""
@@ -2986,11 +3075,11 @@ msgstr ""
msgid "Unknown closing element <%s>"
msgstr ""
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr ""
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index b07a1db15911724f83476c4ac49dc0d3d810280a..448e03614349c647175e36a472419e53445d5e69 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-06-05 15:07+0100\n"
"Last-Translator: Carles Muñoz Gorriz <carlesmu@internautas.org>\n"
"Language-Team: Catalan\n"
@@ -18,373 +18,331 @@ msgstr ""
"Plural-Forms: Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: KBabel 1.11.2\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "S'estan recollint fitxers…"
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Voleu ometre-ho?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "No s'ha pogut determinar la informació del fitxer «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "No s'han pogut canviar els permisos del fitxer «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "No s'ha pogut canviar el propietari del fitxer «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "No s'ha pogut canviar el grup del fitxer «%s»: %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "El fitxer «%s» ja existeix. Voleu reemplaçar-lo amb un fitxer buit?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Impossible eliminar «%s».\n"
-"\n"
-"El voleu ometre?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"No s'ha pogut creat un fitxer buit «%s».\n"
-"\n"
-"El voleu ometre?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "No s'ha pogut llegir el contigut de la carpeta"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Error desconegut"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "No heu especificat el camp Exec"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "No heu especificat el camp URL"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "El nom de l'escriptori no és và lid"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "No s'ha pogut analitzar el fitxer"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "El nom del fitxer no és và lid"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "No s'ha pogut consultar l'estat del fitxer «%s»: %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"u%s.\n"
-"\n"
-"El voleu sobreescriure?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "No s'ha pogut eliminar «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Impossible de carregar el programa des del fitxer %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Ordre"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "L'ordre a executar amb el gestor mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Indicadors"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Els marcadors pel gestor mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Icona"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Seleccioneu fitxers per canviar el nom"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "La icona del gestor mime"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "S'està preparant…"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nom"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "No s'han pogut canviar els permisos del fitxer «%s»: %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "El nom del gestor mime"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "No s'ha pogut canviar el propietari del fitxer «%s»: %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "document %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "No s'ha pogut canviar el grup del fitxer «%s»: %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "No s'ha pogut crear el directori «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "El camà és massa llarg per caber a la memòria intermèdia"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "La URI és massa llarg per caber a la memòria intermèdia"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Mida"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Tamany de les miniatures"
+msgid "The file \"%s\" already exists"
+msgstr "El fitxer «%s» ja existeix"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "S'està suprimint directoris…"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "No s'ha pogut crear la sortida del conducte «%s»"
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "No s'ha pogut suprimir el directori «%s»: %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "No s'ha pogut transferà el directori arrel"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "S'està preparant…"
+msgid "Failed to open \"%s\" for reading"
+msgstr "No s'ha pogut obrir «%s» per lectura"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Camà invà lid"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "No s'ha pogut obrir «%s» per escriptura"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Usuari desconegut «%s»"
+msgid "Failed to write data to \"%s\""
+msgstr "No s'ha pogut escriure a «%s»"
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "No s'ha pogut determinar el punt de muntatge per %s"
+msgid "Failed to remove \"%s\""
+msgstr "No s'ha pogut suprimir «%s»"
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "No s'ha pogut connectar al dimoni HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "No s'ha pogut llegir des de «%s»"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "còpia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "enllaç a %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "un altre còpia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "un altre enllaç a %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "tercera còpia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "tercer enllaç a %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%ua còpia de %s"
msgstr[1] "%ua còpia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%ua enllaç a %s"
msgstr[1] "%ua enllaç a %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "No s'ha pogut determinar la informació del fitxer per «%s»"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "No s'ha pogut crear el directori «%s»"
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "No s'ha pogut crear la sortida del conducte «%s»"
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Els conductes amb nom no estan suportats"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "No s'ha pogut obrir «%s» per lectura"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "No s'ha pogut crear l'enllaç de «%s»"
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "El fitxer «%s» ja existeix"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "No s'ha pogut obrir «%s» per escriptura"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Els enllaços simbòlics no estan suportats"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "No s'ha pogut llegir des de «%s»"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Sistema de fitxers"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "No s'ha pogut canviar al nom de «%s» a «%s»."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "No s'ha pogut canviar al nom de «%s» a «%s»."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "No s'ha pogut canviar al nom de «%s» a «%s»."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "El camà «%s» no és correspon amb un directori"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "No s'ha pogut escriure a «%s»"
+msgid "Failed to load application from file %s"
+msgstr "Impossible de carregar el programa des del fitxer %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "No s'ha pogut suprimir «%s»"
+msgid "Failed to remove \"%s\": %s"
+msgstr "No s'ha pogut eliminar «%s»: %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "S'ha canceŀlat l'operació"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Ordre"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "No s'ha pogut llegir l'enllaç de «%s»"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "L'ordre a executar amb el gestor mime"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Indicadors"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Els marcadors pel gestor mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Icona"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "La icona del gestor mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nom"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "El nom del gestor mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "No s'ha pogut crear l'enllaç de «%s»"
+msgid "%s document"
+msgstr "document %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "No s'ha pogut canviar el mode per «%s»"
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Els enllaços simbòlics no estan suportats"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "El camà és massa llarg per caber a la memòria intermèdia"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "La URI és massa llarg per caber a la memòria intermèdia"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Mida"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Tamany de les miniatures"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "S'estan recollint fitxers…"
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Camà invà lid"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "No s'ha pogut determinar la informació del fitxer per «%s»"
+msgid "Unknown user \"%s\""
+msgstr "Usuari desconegut «%s»"
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "No s'ha pogut determinar el punt de muntatge per %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "No s'ha pogut copiar el fitxer especial «%s»"
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "No s'ha pogut connectar al dimoni HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -501,58 +459,148 @@ msgid "Sort items in descending order"
msgstr "Ordena els elements en ordre descendent"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "No s'ha pogut executar l'operació"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "No s'ha pogut obrir «%s»"
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "No s'ha pogut obrir «%s»: %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "S'estan copiant els fitxers…"
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "S'estan creant els enllaços simbòlics…"
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "S'estan movent els fitxers…"
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "S'estan movent els fitxers…"
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Voleu suprimir de manera\n"
+"permanent «%s»?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Esteu segur de voler suprimir de manera \n"
+"permanent el fitxer seleccionat?"
+msgstr[1] ""
+"Esteu segur de voler suprimir de manera \n"
+"permanent els fitxers seleccionats?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Si suprimiu un fitxer és una pèrdua permanent."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "S'estan suprimint els fitxers…"
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "S'estan creant els fitxers…"
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "S'estan creant els directoris…"
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Fitx_er buit"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "No s'ha pogut determinar el punt de muntatge per %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Crea una carpeta nova a «%s»"
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Crea una _carpeta…"
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "No s'ha pogut suprimir «%s»"
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "S'estan suprimint els fitxers…"
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "No s'ha pogut especificar l'aplicació per defecte per «%s»"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "No s'ha seleccionat cap aplicació"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -561,20 +609,20 @@ msgstr ""
"s»."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "Altres Aplicaci_ons…"
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Obre amb"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Usa una ordre _personalitzada:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -583,40 +631,39 @@ msgstr ""
"llista d'apliacions"
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Navega…"
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Utilitza per _defecte per a aquest tipus de fitxer"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "No s'ha pogut afegir una nova aplicació «%s»"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "No s'ha pogut executar «%s»"
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "Sup_rimeix llançador"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Obre <i>%s</i> i d'altres fitxers de tipus «%s» amb:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -624,8 +671,7 @@ msgstr ""
"Navegueu pel sistema de fitxer i seleccioneu l'aplicació per obrir els "
"fitxers del tipus «%s»."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -634,12 +680,12 @@ msgstr ""
"Canvia l'aplicació per defecte pels fitxers del tipus «%s» per l'aplicació "
"seleccionada"
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Voleu suprimir permanentment «%s»?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -653,39 +699,39 @@ msgstr ""
"Només podeu treure llançadors d'aplicacions que han estat creats amb l'ordre "
"personalitzada d'«Obre amb» del gestor de fitxers."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Seleccioneu una aplicació"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Tots els fitxers"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Fitxer executables"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Seqüències en Perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Seqüències en Python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Seqüències en Ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Seqüències d'intèrpret d'ordres"
@@ -705,7 +751,7 @@ msgid "Other Applications"
msgstr "Altres Aplicacions"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "El portaretalls no té res per enganxar"
@@ -773,14 +819,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "Expand_eix les columnes automà ticament aixà com sigui necessari"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Desconegut"
@@ -792,7 +839,7 @@ msgstr "Mostra el llistat compacte"
msgid "Compact view"
msgstr "Visualització compacta"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Introduïu el nom nou:"
@@ -818,16 +865,32 @@ msgstr "Llistat detallat de directoris"
msgid "Details view"
msgstr "Mostra detalls"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "Crèdits de traductors"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "No s'ha pogut obrir el visor de documentació"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_SÃ"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Si _a tot"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_No"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Canceŀla"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Copiar aquÃ"
@@ -882,7 +945,7 @@ msgstr "Propietari"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Permisos"
@@ -898,14 +961,10 @@ msgstr "Fitxer"
msgid "File Name"
msgstr "Nom de fitxer"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "La carpeta arrel no té pare"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Sistema de fitxers"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -941,14 +1000,14 @@ msgstr "Visulització per icones"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Obre"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Obre-ho en una nova finestra"
@@ -1085,12 +1144,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Obri els fitxers seleccionats"
msgstr[1] "Obri els fitxers seleccionats"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "enllaç romput"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1098,83 +1157,101 @@ msgstr[0] "%d element (%s), espai lliure: %s"
msgstr[1] "%d elements (%s), espai lliure: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d element, espai lliure: %s"
msgstr[1] "%d elements, espai lliure: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d element"
msgstr[1] "%d elements"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "«%s» enllaç romput"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "«%s» (%s) enllaça cap a %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "«%s» (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Tamany de la imatge:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d element seleccionat (%s)"
msgstr[1] "%d elements seleccionats (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d element seleccionat"
msgstr[1] "%d elements seleccionats"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Espaiat"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "L'espai entre els botons de camÃ"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Obre «%s» dins aquesta finestra"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Obre «%s» a una finestra nova"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Crea una carpeta nova a «%s»"
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Crea una _carpeta…"
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1182,29 +1259,29 @@ msgstr ""
"Mou o copia els arxius seleccionats abans amb les ordres Retalla o Copia "
"dins «%s»"
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Enganxa adins la carpeta"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Visualitza les propietats del directori «%s»"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Propietats"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Carpeta nova"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Crea una carpeta nova"
@@ -1221,11 +1298,11 @@ msgstr "_Ubicació:"
msgid "Failed to launch \"%s\""
msgstr "No s'ha pogut llançar «%s»"
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Mida d'icona"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "La mida de la icona per l'entrada del camÃ"
@@ -1307,17 +1384,15 @@ msgid "Stop applying permissions recursively."
msgstr "Atura d'aplicar els permisos recursivament."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Pregunta"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Voleu aplicar-ho recursivament?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1326,11 +1401,11 @@ msgstr ""
"Voleu aplicar els canvis a tots els fitxers i\n"
"subdirectoris més avall del directori seleccionat?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_No m'ho tornis a demanar"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1340,29 +1415,29 @@ msgstr ""
"Igualment podeu usar el dià leg de preferènceis per modificar-la."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "No s'ha pogut canviar el grup"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "No s'han pogut aplicar els permisos nous."
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "El propietari és desconegut"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Voleu arreglar els permisos del directori automà ticament?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Arregla els permisos del directori"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1372,76 +1447,56 @@ msgstr ""
"Després d'això sols els usuaris amb permÃs de lectura tindran accés al "
"directori."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_SÃ"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Si _a tot"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_No"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Canceŀla"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Preferències del gestor de fitxers"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Vistes"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Vista predeterminada"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Visualitza els directoris _nous usant:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Vista d'icones"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Vista de llistat detallat"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Visualització de llistat compacte"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Darrera vista activa"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Situa els directoris abans dels _fitxers"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Seleccioni aquesta opció per veure abans els directoris que els fitxers."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Mo_stra miniatures"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1449,11 +1504,11 @@ msgstr ""
"Seleccioneu aquesta opció si voleu visualitzar els fitxers examinables "
"mitjançant una miniatura."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Text al costat de les icones"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1464,58 +1519,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Subfinestra lateral"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Subfinestra de dreceres"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "Mida d'_icones:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Molt petit"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Més petita"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Petit"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normals"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Gran"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Més gran"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Molt gran"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Mostra els distintius de les icon_es"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1524,19 +1579,19 @@ msgstr ""
"subfinestra de dreceres. Els distintius es defineixen al dià leg de "
"propietats del directori."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Subfinestre en arbre"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Mida d'ico_na:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Mostra els e_mblemes"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1548,16 +1603,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Comportament"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "Només un _clic per a activar els elements"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1565,7 +1623,7 @@ msgstr ""
"Especifiqueu el r_etard abans de que els elements\n"
"es seleccionin en posar el cursor sobre ells:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1579,34 +1637,34 @@ msgstr ""
"tot a l'esquerra. Aquest comportament pot ser útil si teniu activat els "
"clics senzills i sols voleu seleccionar els elements sense activar-los."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Desactivat"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Mitjà "
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Llarg"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Doble clic per a activar els elements"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Avançat"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Permisos del directori"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1616,180 +1674,185 @@ msgstr ""
" aplicar-los al seu contingut. Seleccioneu el\n"
" comportament predeterminat:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Demana sempre"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Aplica sols al directori"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Aplica al directori i al contingut"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(queda %lu hora)"
msgstr[1] "(queden %lu hores)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(queda %lu minut)"
msgstr[1] "(queden %lu minuts)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(queda %lu segon)"
msgstr[1] "(queden %lu segons)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "General"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Nom:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Tipus:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Obre amb:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Objectiu de l'enllaç:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Suprimeix"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Modificat:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Accedit:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Mida:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Volum:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Espai lliure:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Distintius"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Propietats"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "No s'ha pogut canviar el nom «%s»"
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Fitxers"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Fitxer del menú contextual"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Afegeix fitxers…"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Inclou fitxers adicionals al llistat de fitxers a canviar el nom"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Buida"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Buida el llistat"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Quant a"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Visualitza la informació quant al canviador de nom en bloc de Thunar"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Propietats…"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Visualitza les propietats del fitxer seleccionat"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Canvia el nom de multiples fitxers"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "Canvia el no_m fitxers"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "Feu clic aquà per canviar el nom dels fitxers llistats."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Nom nou"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr "Feu clic aquà per veure la documentació de l'operació de canvi de nom."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1800,30 +1863,30 @@ msgstr ""
"del codi font mireu si heu activat el connector «Simple Builtin Renamers»."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Seleccioneu fitxers per canviar el nom"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Fitxers d'audio"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Fitxers d'imatge"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Fitxers de vÃdeo"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Canvi de nom en bloc"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1831,13 +1894,13 @@ msgstr ""
"El Canvi de nom en bloc de Thunar és una eina potent i flexible \n"
"que vos permetrà canviar el nom de múltiples fitxers alhora."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Suprimeix el fitxer"
msgstr[1] "Suprimeix els fitxers"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] ""
@@ -1846,7 +1909,7 @@ msgstr[1] ""
"Suprimeix els fitxers seleccionats del llistat de fitxers a canviar el nom"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Canvi de nom en bloc - Canvia el nom de múltiples fitxers"
@@ -1893,120 +1956,120 @@ msgstr[0] "Afegeix la carpeta a la subfinestra de decreres"
msgstr[1] "Afegeix les carpetes a la subfinestra de decreres"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Munta el volum"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "Expulsa e_l volum"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "Desm_unta el volum"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "Sup_rimeix la drecera"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Ca_nvia el nom a la drecera"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "El camà «%s» no és correspon amb un directori"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "No s'ha pogut afegir una drecera nova"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "No s'ha pogut expulsar «%s»"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "No s'ha pogut muntar «%s»"
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "No s'ha pogut desmuntar «%s»"
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Feu clic aquà per aturar el cà lcul del tamany del directori."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "S'ha aturat el cà lcul"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "S'està calculant…"
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s octets"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u element, en total %s"
msgstr[1] "%u elements, en total %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Carpeta del menú contextual"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Crea una carpeta buida dins la carpeta actual"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "Re_talla"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Copia"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "_Enganxa"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Mou o copia els fitxers prèviament seleccionats mitjançant l'ordre de "
"Retalla o Copia"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Suprimeix"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2014,158 +2077,145 @@ msgstr ""
"Mou o copia a la carpeta seleccionada els fitxers prèviament seleccionats "
"mitjançant l'ordre Retalla o Copia"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Seleccion_a tots els fitxers"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Selecciona tots els fitxers de la finestra"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Selecciona per _patró…"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Selecciona tots els fitxers que coincideixen amb un patró"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Du_plica"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Crea un _enllaç"
msgstr[1] "Crea _enllaços"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Canvia de nom…"
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Canvia el nom al fitxer seleccionat"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Crea un _document"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "S'estan carregant els continguts de la carpeta…"
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Fitxer buit nou"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Fitxer buit nou…"
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Crea un document a partir de la plantilla «%s»"
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Voleu suprimir de manera\n"
-"permanent «%s»?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Esteu segur de voler suprimir de manera \n"
-"permanent el fitxer seleccionat?"
-msgstr[1] ""
-"Esteu segur de voler suprimir de manera \n"
-"permanent els fitxers seleccionats?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Si suprimiu un fitxer és una pèrdua permanent."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Selecciona per patró"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Selecciona"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Patró:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Canvia el nom de «%s»"
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "Nom de fitxer obtingut del lloc d'arrossegament XDS no és và lid"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "No s'ha pogut crear l'enllaç per l'URL «%s»"
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "No s'ha pogut obrir el directori «%s»"
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "Prepara el fitxer seleccionat i serà mogut amb l'ordre d'Enganxar"
msgstr[1] ""
"Prepara els fitxers seleccionats i seran moguts amb l'ordre d'Enganxar"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "Prepara el fitxer seleccionat i serà copiat amb l'ordre d'Enganxar"
msgstr[1] ""
"Prepara els fitxers seleccionats i seran copiats amb l'ordre d'Enganxar"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Suprimeix permanentment el fitxer seleccionat"
-msgstr[1] "Suprimeix permanentment els fitxers seleccionat"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Duplica el fitxer seleccionat"
+msgstr[1] "Duplica els fitxers seleccionats"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Duplica el fitxer seleccionat"
msgstr[1] "Duplica els fitxers seleccionats"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Crea un enllaç simbòlic del fitxer seleccionat"
msgstr[1] "Crea un enllaç simbòlic dels fitxers seleccionats"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Canvia el nom al fitxer seleccionat"
+msgstr[1] "Canvia el nom al fitxer seleccionat"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Canvia el nom al fitxer seleccionat"
+msgstr[1] "Canvia el nom al fitxer seleccionat"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Crea"
@@ -2184,20 +2234,30 @@ msgstr "No s'han pogut trobar plantilles"
msgid "_Empty File"
msgstr "Fitx_er buit"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "S'està carregant…"
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "Enganxa a la car_peta"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "P_ropietats…"
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Obre una nova _finestra"
@@ -2622,23 +2682,23 @@ msgid "Shutter Speed:"
msgstr "Velocitat d'obturació:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Programa:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Imatge"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Tipus d'imatge:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Tamany de la imatge:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2818,39 +2878,39 @@ msgstr ""
msgid "Search & Replace"
msgstr "Cerca reemplaça"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2860,30 +2920,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "S'estan copiant els fitxers…"
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "No s'ha pogut crear el directori «%s»"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "No s'ha pogut crear l'enllaç de «%s»"
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2891,7 +2951,7 @@ msgstr[0] "No s'ha pogut obrir %d fitxer"
msgstr[1] "No s'han pogut obrir %d fitxers"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "No s'ha pogut obrir %d fitxer"
@@ -2900,6 +2960,33 @@ msgstr "No s'ha pogut obrir %d fitxer"
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "No s'ha pogut connectar al dimoni HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Accions personalitzades"
@@ -3140,11 +3227,11 @@ msgstr ""
msgid "Unknown closing element <%s>"
msgstr "Element de tancament desconegut <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "No s'ha pogut determinar la ubicació pel fitxer uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Ordre no configurat"
@@ -3195,3 +3282,86 @@ msgstr "Obri el directori amb Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Obre les carpetes especificades dins Thunar"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Suprimeix permanentment el fitxer seleccionat"
+#~ msgstr[1] "Suprimeix permanentment els fitxers seleccionat"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "No s'han pogut canviar els permisos del fitxer «%s»: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Voleu ometre-ho?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "No s'ha pogut determinar la informació del fitxer «%s»: %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "El fitxer «%s» ja existeix. Voleu reemplaçar-lo amb un fitxer buit?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Impossible eliminar «%s».\n"
+#~ "\n"
+#~ "El voleu ometre?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "No s'ha pogut creat un fitxer buit «%s».\n"
+#~ "\n"
+#~ "El voleu ometre?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "No s'ha pogut consultar l'estat del fitxer «%s»: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "u%s.\n"
+#~ "\n"
+#~ "El voleu sobreescriure?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "No s'ha pogut crear el directori «%s»: %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "S'està suprimint directoris…"
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "No s'ha pogut suprimir el directori «%s»: %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "No s'ha pogut transferà el directori arrel"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Els conductes amb nom no estan suportats"
+
+#~ msgid "Operation canceled"
+#~ msgstr "S'ha canceŀlat l'operació"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "No s'ha pogut llegir l'enllaç de «%s»"
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "No s'ha pogut canviar el mode per «%s»"
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "No s'ha pogut copiar el fitxer especial «%s»"
diff --git a/po/cs.po b/po/cs.po
index 46079dfc205c75fe9061d0282d0b56f3e8622bba..6836a1e3c3880bf3eb9c59ac7f95d05f3a575508 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-05-08 17:13+0100\n"
"Last-Translator: Michal Várady <miko.vaji@gmail.com>\n"
"Language-Team: Čeština <translation-team-cs@lists.sourceforge.net>\n"
@@ -16,280 +16,139 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "SbÃrám soubory..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Chcete jej pÅ™eskoÄit?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "NepodaÅ™ilo se zÃskat informace o souboru \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "NepodaÅ™ilo se nastavit pÅ™Ãstupová práva k souboru \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "NepodaÅ™ilo se zmÄ›nit vlastnÃka souboru \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Nepodařilo se změnit skupinu souboru \"%s\": %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Soubor \"%s\" již existuje. Chcete jej nahradit prázdným souborem?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Nepodařilo se odstranit soubor \"%s\".\n"
-"\n"
-"Chcete jej pÅ™eskoÄit?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Nepodařilo se vytvořit prázdný soubor \"%s\".\n"
-"\n"
-"Chcete jej pÅ™eskoÄit?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Obsah adresaáře se nepodaÅ™ilo pÅ™eÄÃst"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Neznámá chyba"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Nebylo zadáno pole Exec"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Nebyla zadána adresa URL"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Neplatný soubor plochy"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Nepodařilo se zpracovat soubor"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Neplatné jméno souboru"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr ""
-"NepodaÅ™ilo se zÃskat informace o stavu souboru \"%s\" pomocà pÅ™Ãkazu stat: %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Chcete jej přepsat?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Nepodařilo se odstranit soubor \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Nepodařilo se zavést aplikaci ze souboru %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "PÅ™Ãkaz"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "PÅ™Ãznaky"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Ikona"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Vyberte soubory pro pÅ™ejmenovánÃ"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr ""
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Připravuji..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Název"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "NepodaÅ™ilo se nastavit pÅ™Ãstupová práva k souboru \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr ""
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "NepodaÅ™ilo se zmÄ›nit vlastnÃka souboru \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "dokument %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Nepodařilo se změnit skupinu souboru \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Nepodařilo se vytvořit adresář \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Cesta je pÅ™ÃliÅ¡ dlouhá k uloženà do bufferu"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "Adresa URI je pÅ™ÃliÅ¡ dlouhá k uloženà do bufferu"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Velikost"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Požadovaná velikost náhledu"
+msgid "The file \"%s\" already exists"
+msgstr "Soubor \"%s\" již existuje"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Mažu adresáře..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Nepodařilo se vytvořit pojmenovanou frontu fifo \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Nepodařilo se odstranit adresář \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Nelze přenést kořenový adresář"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Připravuji..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "NepodaÅ™ilo se otevÅ™Ãt soubor \"%s\" pro ÄtenÃ"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Neplatná cesta"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "NepodaÅ™ilo se otevÅ™Ãt soubor \"%s\" pro zápis"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Neznámý uživatel \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "Zápis dat do souboru \"%s\" selhal"
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Nebylo možné rozpoznat pÅ™Ãpojný bod pro %s"
+msgid "Failed to remove \"%s\""
+msgstr "Nepodařilo se odstranit soubor \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Nebylo možné se připojit k démonu HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Čtenà dat ze souboru \"%s\" selhalo"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "kopie %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "odkaz na %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "dalšà kopie %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "dalšà odkaz na %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "třetà kopie %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "třetà odkaz na %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
@@ -297,7 +156,7 @@ msgstr[0] "%u. kopie %s"
msgstr[1] "%u. kopie %s"
msgstr[2] ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
@@ -305,87 +164,185 @@ msgstr[0] "%u. odkaz na %s"
msgstr[1] "%u. odkaz na %s"
msgstr[2] "%u. odkaz na %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "NepodaÅ™ilo se zÃskat informace o souboru \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Nepodařilo se vytvořit adresář \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Nepodařilo se vytvořit pojmenovanou frontu fifo \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Pojmenované roury nejsou podporovány"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "NepodaÅ™ilo se otevÅ™Ãt soubor \"%s\" pro ÄtenÃ"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Nepodařilo se vytvořit symbolický odkaz \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Soubor \"%s\" již existuje"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "NepodaÅ™ilo se otevÅ™Ãt soubor \"%s\" pro zápis"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Symbolické odkazy nejsou podporovány"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Čtenà dat ze souboru \"%s\" selhalo"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Systém souborů"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Nepodařilo se přejmenovat \"%s\" na \"%s\"."
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Nepodařilo se přejmenovat \"%s\" na \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Nepodařilo se přejmenovat \"%s\" na \"%s\"."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Cesta \"%s\" neodkazuje na adresář"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Zápis dat do souboru \"%s\" selhal"
+msgid "Failed to load application from file %s"
+msgstr "Nepodařilo se zavést aplikaci ze souboru %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Nepodařilo se odstranit soubor \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "Nepodařilo se odstranit soubor \"%s\": %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Operace byla zrušena"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "PÅ™Ãkaz"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "NepodaÅ™ilo se naÄÃst cÃl odkazu z \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "PÅ™Ãznaky"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Ikona"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Název"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Nepodařilo se vytvořit symbolický odkaz \"%s\""
+msgid "%s document"
+msgstr "dokument %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Nepodařilo se změnit mód souboru \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Symbolické odkazy nejsou podporovány"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Cesta je pÅ™ÃliÅ¡ dlouhá k uloženà do bufferu"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "Adresa URI je pÅ™ÃliÅ¡ dlouhá k uloženà do bufferu"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Velikost"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Požadovaná velikost náhledu"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "SbÃrám soubory..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Neplatná cesta"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "NepodaÅ™ilo se zÃskat informace o souboru \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "Neznámý uživatel \"%s\""
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "Nebylo možné rozpoznat pÅ™Ãpojný bod pro %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "NepodaÅ™ilo se zkopÃrovat speciálnà soubor \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Nebylo možné se připojit k démonu HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -502,58 +459,151 @@ msgid "Sort items in descending order"
msgstr "SeÅ™adit položky v sestupném poÅ™adÃ"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Nepodařilo se spustit operaci"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "NepodaÅ™ilo se otevÅ™Ãt soubor \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "NepodaÅ™ilo se otevÅ™Ãt soubor \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "KopÃruji soubory..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "VytvářÃm symbolické odkazy..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Přesouvám soubory..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Přesouvám soubory..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Jste si jisti, že chcete trvale\n"
+"odstranit \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Jste si jisti, že chcete trvale odstranit\n"
+"vybraný soubor?"
+msgstr[1] ""
+"Jste si jisti, že chcete trvale odstranit\n"
+"%u soubory?"
+msgstr[2] ""
+"Jste si jisti, že chcete trvale odstranit\n"
+"%u souborů?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Pokud smažete soubor, bude nenávratně ztracen."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Mažu soubory..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "VytvářÃm soubory..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "VytvářÃm adresáře..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "_Prázdný soubor"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Nebylo možné rozpoznat pÅ™Ãpojný bod pro %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Vytvořit nový adresář v \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Vytvořit _adresář..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Nepodařilo se odstranit soubor \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Mažu soubory..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Nepodařilo se nastavit výchozà aplikaci pro \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Nebyla vybrána žádná aplikace"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -562,20 +612,20 @@ msgstr ""
"\"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "Jiná _aplikace..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "OtevÅ™Ãt pomocÃ"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "PoužÃt _vlastnà pÅ™Ãkaz"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -583,62 +633,60 @@ msgstr ""
"Použije vlastnà pÅ™Ãkaz pro aplikaci, která nenà dostupná v seznamu výše."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Procházet..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "PoužÃt jako _výchozà pro tento typ souboru"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Nepodařilo se přidat novou aplikaci \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Nepodařilo se spustit \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
#, fuzzy
msgid "_Remove Launcher"
msgstr "SpouÅ¡tÄ›Ä"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "OtevÅ™Ãt <i>%s</i> a dalÅ¡Ã soubory typu \"%s\" pomocÃ:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
msgstr "Vybrat aplikaci pro soubory typu \"%s\" procházenÃm systému souborů"
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr "Změnit výchozà aplikaci pro soubory typu \"%s\" na vybranou aplikaci."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, fuzzy, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr ""
"Jste si jisti, že chcete trvale\n"
"odstranit \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -647,39 +695,39 @@ msgid ""
"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Vyberte aplikaci"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "VÅ¡echny soubory"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Spustitelné soubory"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Skripty jazyka perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Skripty jazyka python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Skripty jazyka ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shellové skripty"
@@ -699,7 +747,7 @@ msgid "Other Applications"
msgstr "Jiné aplikace"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Ve schránce se nenacházà nic, co by mohlo být vloženo"
@@ -767,14 +815,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "Automaticky rozÅ¡ÃÅ™it sloupc_e podle potÅ™eby"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Neznámý"
@@ -786,7 +835,7 @@ msgstr "StruÄný výpis adresáře"
msgid "Compact view"
msgstr "StruÄný pohled"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Zadejte nový název:"
@@ -812,16 +861,32 @@ msgstr "Podrobný výpis adresáře"
msgid "Details view"
msgstr "Ukázat podrobnosti"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "translator-credits"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "NepodaÅ™ilo se otevÅ™Ãt prohlÞeÄ dokumentace"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Ano"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Ano pro _všechny"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Ne"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Zrušit"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "ZkopÃrovat _sem"
@@ -876,7 +941,7 @@ msgstr "VlastnÃk"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "PÅ™Ãstupová práva"
@@ -892,14 +957,10 @@ msgstr "Soubor"
msgid "File Name"
msgstr "Název souboru"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Kořenový adresář nemá nadřazený adresář"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Systém souborů"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -933,14 +994,14 @@ msgstr "Ikony"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_OtevÅ™Ãt"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "OtevÅ™Ãt v novém oknÄ›"
@@ -1087,12 +1148,12 @@ msgstr[0] "OtevÅ™Ãt vybrané soubory"
msgstr[1] "OtevÅ™Ãt vybrané soubory"
msgstr[2] "OtevÅ™Ãt vybrané soubory"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "neplatný odkaz"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1101,7 +1162,7 @@ msgstr[1] "%d položky (%s), %s volných"
msgstr[2] "%d položek (%s), %s volných"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
@@ -1109,7 +1170,7 @@ msgstr[0] "%d položka, %s volných"
msgstr[1] "%d položky, %s volných"
msgstr[2] "%d položek, %s volných"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
@@ -1117,22 +1178,36 @@ msgstr[0] "%d položka"
msgstr[1] "%d položky"
msgstr[2] "%d položek"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" neplatný odkaz"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) odkaz na %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Velikost obrázku:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
@@ -1140,7 +1215,7 @@ msgstr[0] "%d vybraná položka (%s)"
msgstr[1] "%d vybrané položky (%s)"
msgstr[2] "%d vybraných položek (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
@@ -1148,40 +1223,44 @@ msgstr[0] "%d vybraná položka"
msgstr[1] "%d vybrané položka"
msgstr[2] "%d vybraných položek"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Odstupy"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Množstvà mÃsta mezi tlaÄÃtky pro cestu"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "OtevÅ™Ãt \"%s\" v tomto oknÄ›"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "OtevÅ™Ãt \"%s\" v novém oknÄ›"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Vytvořit nový adresář v \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Vytvořit _adresář..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1189,29 +1268,29 @@ msgstr ""
"ZkopÃrovat nebo pÅ™esunout dÅ™ÃvÄ›jÅ¡Ã výbÄ›r pomocà pÅ™Ãkazů Vyjmout a ZkopÃrovat "
"do \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Vložit do adresáře"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Zobrazit vlastnosti adresáře \"%s\""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Vlastnosti"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Nový adresář"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Vytvořit nový adresář"
@@ -1228,11 +1307,11 @@ msgstr "_UmÃstÄ›nÃ:"
msgid "Failed to launch \"%s\""
msgstr "Nepodařilo se spustit \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Velikost ikony"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Velikost ikony pro položku cesty"
@@ -1314,17 +1393,15 @@ msgid "Stop applying permissions recursively."
msgstr "Neaplikovat pÅ™Ãstupová práva rekurzivnÄ›."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Otázka"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Aplikovat rekurzivnÄ›?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1333,11 +1410,11 @@ msgstr ""
"Chcete pro vybraný adresář aplikovat změny pro\n"
"všechny soubory a podadresáře rekurzivně?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "PÅ™ÃÅ¡tÄ› se již _nedotazovat"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1347,29 +1424,29 @@ msgstr ""
"dotazováni. K pozdějšà změně Vašeho nastavenà použijte dialog Možnosti."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Nepodařilo se změnit skupinu"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "NepodaÅ™ilo se nastavit nová pÅ™Ãstupová práva"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Neznámý vlastnÃk souboru"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Opravit pÅ™Ãstupová práva k adresáři automaticky?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Opravit pÅ™Ãstupová práva k adresáři"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1379,75 +1456,55 @@ msgstr ""
"adresáři bude poté povolen jen uživatelům, oprávnÄ›ným ke Ätenà tohoto "
"adresáře."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Ano"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Ano pro _všechny"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Ne"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Zrušit"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Možnosti správce souborů"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Vzhled"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Výchozà vzhled"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Vzhled okna s nově otevřeným _adresářem:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Ikony"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Podrobný seznam"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "StruÄný seznam"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Stejný jako poslednà adresář"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Zařadit _adresáře před soubory"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr "Vyberte tuto možnost pro vypsánà adresářů před soubory."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "_Ukazovat náhledy"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1455,11 +1512,11 @@ msgstr ""
"Vyberte tuto možnost pro zobrazenà náhledů u souborů kromě adresářů s "
"automaticky generovanými náhledy."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Popisky vedle ikon"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1470,58 +1527,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "BoÄnà panel"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Panel se záložkami"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_Velikost ikony:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Velmi malé"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "MenÅ¡Ã"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Malé"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "StÅ™ednÃ"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Velké"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "VÄ›tÅ¡Ã"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Velmi velké"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Zobrazovat emblémy"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1529,19 +1586,19 @@ msgstr ""
"Vyberte tuto možnost pro zobrazenà emblémů v panelu záložek pro všechny "
"adresáře, pro které byly emblémy definovány v dialogu vlastnostà adresáře."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Panel stromu"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Veliko_st ikon:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Zobrazovat e_mblémy"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1553,16 +1610,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "ChovánÃ"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "_Jednoduché kliknutà pro aktivaci položky"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1570,7 +1630,7 @@ msgstr ""
"Upřesněte _zpožděnà před aktivacà položky\n"
"po přejetà ukazatelem myši:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1584,34 +1644,34 @@ msgstr ""
"možnosti \"aktivace položky jednÃm kliknutÃm\", pokud chcete položku pouze "
"vybrat, nikoli však aktivovat."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Vypnuto"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "StÅ™ednÃ"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Dlouhý"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Dvojité kliknutà pro aktivaci položky"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "RozÅ¡ÃÅ™ené"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "PÅ™Ãstupová práva k adresáři"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1621,19 +1681,19 @@ msgstr ""
"také použÃt zmÄ›ny pro obsah samotného adresáře.\n"
"Výchozà chovánà zvolte nÞe:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Ptát se vždy"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "PoužÃt pouze na tento adresář"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "PoužÃt na adresář a jeho obsah"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1641,7 +1701,7 @@ msgstr[0] "(zbývá %lu hodina)"
msgstr[1] "(zbývajà %lu hodiny)"
msgstr[2] "(zbýváà %lu hodin)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1649,7 +1709,7 @@ msgstr[0] "(zbývá %lu minuta)"
msgstr[1] "(zbývajà %lu minuty)"
msgstr[2] "(zbývá %lu minut)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1657,147 +1717,152 @@ msgstr[0] "(zbývá %lu vteřina)"
msgstr[1] "(zbývajà %lu vteřiny)"
msgstr[2] "(zbývá %lu vteřin)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Obecné"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Název:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Druh:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "OtevÅ™Ãt pomocÃ:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "CÃl odkazu:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Smazat"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Změněno:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Poslednà pÅ™Ãstup:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Velikost:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Svazek:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Volné mÃsto:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Emblémy"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "Vlastnosti %s"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Nepodařilo se přejmenovat \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Soubor"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Kontextová nabÃdka souboru"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Přidat soubory..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Zahrnout dodateÄné soubory do seznamu souborů, urÄených k pÅ™ejmenovánÃ"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "VyÄistit"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "VyÄistit seznam souborů nÞe"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "O _aplikaci"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Zobrazit informace o aplikaci Thunar Bulk Rename"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Vlastnosti..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Zobrazit vlastnosti vybraného souboru"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Přejmenovat skupinu souborů"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Přejmenovat soubory"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "Klikněte sem pro přejmenovánà souborů výše popsaného návrhu"
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Nový název"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr "KliknÄ›te sem pro zobrazenà dokumentace k operaci pÅ™ejmenovánÃ."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1809,30 +1874,30 @@ msgstr ""
"máte povolen zásuvný modul \"Simple Builtin Renamers\""
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Vyberte soubory pro pÅ™ejmenovánÃ"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Zvukové soubory"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Obrázky"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Videa"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Hromadné pÅ™ejmenovánÃ"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1840,14 +1905,14 @@ msgstr ""
"Thunar Bulk Rename je mocný a rozÅ¡ÃÅ™itelný\n"
"nástroj pro pÅ™ejmenovánà vÃce souborů najednou."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Odstranit soubor"
msgstr[1] "Odstranit soubory"
msgstr[2] "Odstranit soubory"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Odstranà vybraný soubor ze seznamu souborů, urÄených k pÅ™ejmenovánÃ"
@@ -1857,7 +1922,7 @@ msgstr[2] ""
"Odstranà vybrané soubory ze seznamu souborů, urÄených k pÅ™ejmenovánÃ"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Bulk Rename - pÅ™ejmenovánà vÃce souborů"
@@ -1908,80 +1973,80 @@ msgstr[1] "Přidá vybrané adresáře do panelu se záložkami"
msgstr[2] "Přidá vybrané adresáře do panelu se záložkami"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Připojit svazek"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "_Vysunout médium"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_Odpojit jednotku"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "O_debrat záložku"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Př_ejmenovat záložku"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Cesta \"%s\" neodkazuje na adresář"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Nepodařilo se přidat novou záložku"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Nepodařilo se vysunout \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Nepodařilo se připojit \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Nepodařilo se odpojit \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "KliknÄ›te sem pro zastavenà výpoÄtu celkové velikosti adresáře."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "VýpoÄet zruÅ¡en"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "PoÄÃtám..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s bytů"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
@@ -1989,40 +2054,40 @@ msgstr[0] "%u položka, celkem %s"
msgstr[1] "%u položky, celkem %s"
msgstr[2] "%u položek, celkem %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Kontextová nabÃdka adresáře"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "VytvoÅ™it prázdný adresář v aktuálnÃm adresáři"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "Vyjmou_t"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_KopÃrovat"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "_Vložit"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"PÅ™esunout nebo zkopÃrovat soubory naposledy vybrané pÅ™Ãkazem Vyjmout nebo "
"ZkopÃrovat"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Smazat"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2030,165 +2095,151 @@ msgstr ""
"PÅ™esune nebo zkopÃruje naposledy vybrané soubory pÅ™Ãkazem Vyjmout nebo "
"ZkopÃrovat do vybraného adresáře"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Vybrat všechn_y soubory"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Vybere všechny soubory v tomto okně"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Vy_brat podle masky..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Vybere vÅ¡echny soubory odpovÃdajÃcà zvolené masce"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Du_plikovat"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Vytvořit _odkaz"
msgstr[1] "Vytvořit _odkazy"
msgstr[2] "Vytvořit _odkazy"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "Přej_menovat..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Přejmenuje vybraný soubor"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Vytvořit _dokument"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "NaÄÃtám obsah adresáře..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Nový prázdný soubor"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Nový prázdný soubor..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Vytvořà dokument z šablony \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Jste si jisti, že chcete trvale\n"
-"odstranit \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Jste si jisti, že chcete trvale odstranit\n"
-"vybraný soubor?"
-msgstr[1] ""
-"Jste si jisti, že chcete trvale odstranit\n"
-"%u soubory?"
-msgstr[2] ""
-"Jste si jisti, že chcete trvale odstranit\n"
-"%u souborů?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Pokud smažete soubor, bude nenávratně ztracen."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Vybrat podle masky"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Vybrat"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Maska:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Přejmenovat \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Vytvořenà odkazu pro adresu URL selhalo \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "NepodaÅ™ilo se otevÅ™Ãt adresář \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "PÅ™ipravà vybraný soubor k pÅ™esunu pomocà pÅ™Ãkazu Vložit"
msgstr[1] "PÅ™ipravà vybraný soubor k pÅ™esunu pomocà pÅ™Ãkazu Vložit"
msgstr[2] "PÅ™ipravà vybraný soubor k pÅ™esunu pomocà pÅ™Ãkazu Vložit"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "PÅ™ipravà vybraný soubor ke zkopÃrovánà pomocà pÅ™Ãkazu Vložit"
msgstr[1] "PÅ™ipravà vybrané soubory ke zkopÃrovánà pomocà pÅ™Ãkazu Vložit"
msgstr[2] "PÅ™ipravà vybrané soubory ke zkopÃrovánà pomocà pÅ™Ãkazu Vložit"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Neobnovitelně smaže vybraný soubor"
-msgstr[1] "Neobnovitelně smaže vybrané soubory"
-msgstr[2] "Neobnovitelně smaže vybrané soubory"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Duplikuje vybraný soubor"
+msgstr[1] "Duplikuje všechny vybrané soubory"
+msgstr[2] "Duplikuje všechny vybrané soubory"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Duplikuje vybraný soubor"
msgstr[1] "Duplikuje všechny vybrané soubory"
msgstr[2] "Duplikuje všechny vybrané soubory"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Vytvořà symbolický odkaz pro vybraný soubor"
msgstr[1] "Vytvořà symbolický odkaz pro vybrané soubory"
msgstr[2] "Vytvořà symbolický odkaz pro vybrané soubory"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Přejmenuje vybraný soubor"
+msgstr[1] "Přejmenuje vybraný soubor"
+msgstr[2] "Přejmenuje vybraný soubor"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Přejmenuje vybraný soubor"
+msgstr[1] "Přejmenuje vybraný soubor"
+msgstr[2] "Přejmenuje vybraný soubor"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "VytvoÅ™"
@@ -2207,20 +2258,30 @@ msgstr "Nejsou nainstalovány žádné šablony"
msgid "_Empty File"
msgstr "_Prázdný soubor"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "NaÄÃtám..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "_Vložit do adresáře"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "_Vlastnosti"
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "OtevÅ™Ãt _nové okno"
@@ -2645,23 +2706,23 @@ msgid "Shutter Speed:"
msgstr "Rychlost uzávěrky:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Software:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Obrázek"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Typ obrázku:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Velikost obrázku:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2839,39 +2900,39 @@ msgstr "Neplatný regulárnà výraz ve znaku na pozici %ld: %s"
msgid "Search & Replace"
msgstr "NajÃt a nahradit"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2881,30 +2942,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "KopÃruji soubory..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "Nepodařilo se vytvořit adresář \"%s\""
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Nepodařilo se vytvořit symbolický odkaz \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2913,7 +2974,7 @@ msgstr[1] "Otevřenà %d souborů selhalo."
msgstr[2] "Otevřenà %d souborů selhalo."
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "Otevřenà %d souboru selhalo."
@@ -2922,6 +2983,33 @@ msgstr "Otevřenà %d souboru selhalo."
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Nebylo možné se připojit k démonu HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Vlastnà akce"
@@ -3156,11 +3244,11 @@ msgstr ""
msgid "Unknown closing element <%s>"
msgstr "Neznámý uzavÃracà prvek <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "NepodaÅ™ilo se zjistit umÃstÄ›nà pro uloženà souboru uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "PÅ™Ãkaz nenà nakonfigurován"
@@ -3211,3 +3299,89 @@ msgstr "OtevÅ™Ãt adresář aplikacà Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "OtevÅ™Ãt specifikované adresáře aplikacà Thunar"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Neobnovitelně smaže vybraný soubor"
+#~ msgstr[1] "Neobnovitelně smaže vybrané soubory"
+#~ msgstr[2] "Neobnovitelně smaže vybrané soubory"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "NepodaÅ™ilo se nastavit pÅ™Ãstupová práva k souboru \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Chcete jej pÅ™eskoÄit?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "NepodaÅ™ilo se zÃskat informace o souboru \"%s\": %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "Soubor \"%s\" již existuje. Chcete jej nahradit prázdným souborem?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Nepodařilo se odstranit soubor \"%s\".\n"
+#~ "\n"
+#~ "Chcete jej pÅ™eskoÄit?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Nepodařilo se vytvořit prázdný soubor \"%s\".\n"
+#~ "\n"
+#~ "Chcete jej pÅ™eskoÄit?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr ""
+#~ "NepodaÅ™ilo se zÃskat informace o stavu souboru \"%s\" pomocà pÅ™Ãkazu "
+#~ "stat: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Chcete jej přepsat?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Nepodařilo se vytvořit adresář \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Mažu adresáře..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Nepodařilo se odstranit adresář \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Nelze přenést kořenový adresář"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Pojmenované roury nejsou podporovány"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Operace byla zrušena"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "NepodaÅ™ilo se naÄÃst cÃl odkazu z \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Nepodařilo se změnit mód souboru \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "NepodaÅ™ilo se zkopÃrovat speciálnà soubor \"%s\""
diff --git a/po/de.po b/po/de.po
index caa84677bdd5cc06ddc668108c4e152e8710a896..3352e2cd8cada1dca335b9d031334f3c18c325b5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Thunar 0.3.2beta2\n"
+"Project-Id-Version: Thunar 0.3.3svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
-"PO-Revision-Date: 2006-06-11 16:40+0100\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
+"PO-Revision-Date: 2006-07-27 18:01+0100\n"
"Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,375 +18,331 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Sammle Dateien..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Wollen Sie diese überspringen?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Die Dateiinformationen für »%s« konnten nicht bestimmt werden: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Die Berechtigungen von »%s« konnte nicht geändert werden: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Der Besitzer von »%s« konnte nicht geändert werden: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Die Gruppe von »%s« konnte nicht geändert werden: %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr ""
-"Die Datei »%s« existiert bereits. Wollen Sie die Datei durch eine leere "
-"Datei ersetzen?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Konnte »%s« nicht löschen.\n"
-"\n"
-"Wollen Sie diese Datei überspringen?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Konnte leere Datei »%s« nicht erstellen.\n"
-"\n"
-"Wollen Sie diese überspringen?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Konnte Ordnerinhalt nicht lesen"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Unbekannter Fehler"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Das Exec-Feld fehlt oder ist leer"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Das URL-Feld fehlt oder ist leer"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Ungültige .desktop Datei"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Konnte Datei nicht parsen"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Ungültiger Dateiname"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Dateiinformationen für »%s« konnten nicht bestimmt werden: %s"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+msgid "Only local files may be renamed"
+msgstr "Ausschließlich lokale Dateien können umbenannt werden"
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Möchten Sie diese überschreiben?"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Vorbereiten..."
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Die Datei »%s« konnte nicht gelöscht werden: %s"
+msgid "Failed to change permissions of \"%s\""
+msgstr "Die Berechtigungen von »%s« konnte nicht geändert werden"
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Konnte die Anwendung aus Datei »%s« nicht starten"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Befehl"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "Der Befehl zum Ausführen des Mime-Handlers"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Kennzeichen"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Die Kennzeichen für den Mime-Handler"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Symbol"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "Das Symbol für den Mime-Handler"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Name"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Der Name für den Mime-Handler"
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Der Besitzer von »%s« konnte nicht geändert werden"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
#, c-format
-msgid "%s document"
-msgstr "%s Dokument"
+msgid "Failed to change file group of \"%s\""
+msgstr "Die Gruppe von »%s« konnte nicht geändert werden"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Konnte Ordner »%s« nicht erstellen: %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Puffer zu klein um Pfad aufzunehmen"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "Puffer zu klein um URI aufzunehmen"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Größe"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Die gewünschte Vorschaugröße"
-
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Ordner werden gelöscht..."
+msgid "The file \"%s\" already exists"
+msgstr "Die Datei »%s« existiert bereits"
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Der Ordner »%s« konnte nicht gelöscht werden: %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Der Wurzelordner kann nicht verschoben oder kopiert werden"
+msgid "Failed to create empty file \"%s\""
+msgstr "Die Datei »%s« konnte nicht erstellt werden"
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Vorbereiten..."
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
+#, c-format
+msgid "Failed to open \"%s\" for reading"
+msgstr "Die Datei »%s« konnte nicht zum Lesen geöffnet werden"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Ungültiger Pfad"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Die Datei »%s« konnte nicht zum Schreiben geöffnet werden"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Unbekannter Benutzer »%s«"
+msgid "Failed to write data to \"%s\""
+msgstr "Die Datei »%s« konnte nicht umbenannt werden"
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Der Einhängepunkt für %s konnte nicht bestimmt werden"
+msgid "Failed to remove \"%s\""
+msgstr "Die Datei »%s« konnte nicht gelöscht werden"
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Konnte keine Verbindung zum HAL Dienst aufbauen: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Das Ziel der Verknüpfung »%s« konnte nicht bestimmt werden"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "Kopie von %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "Verknüpfung mit %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "Weitere Kopie von %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "Weitere Verknüpfung mit %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "Dritte Kopie von %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "Dritte Verknüpfung mit %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%ute Kopie von %s"
msgstr[1] "%ute Kopie von %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%ute Verknüpfung mit %s"
msgstr[1] "%ute Verknüpfung mit %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Die Dateiinformationen für »%s« konnte nicht bestimmt werden"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Konnte Ordner »%s« nicht erstellen"
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Die Datei »%s« konnte nicht umbenannt werden"
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Named Pipes werden nicht unterstützt"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
+#, c-format
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Die Verknüpfung »%s« konnte nicht erstellt werden"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr "Spezialdateien können nicht kopiert werden"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Verknüpfungen werden nicht unterstützt"
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Dateisystem"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Die Datei »%s« konnte nicht zum Lesen geöffnet werden"
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Konnte »%s« nicht nach »%s« kopieren"
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+"Verknüpfungen zu oder von Dateien im Papierkorb werden nicht untterstützt"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Die Datei »%s« existiert bereits"
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Verknüpfung von \"%s\" nach \"%s\" konnte nicht erstellt werden"
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Die Datei »%s« konnte nicht zum Schreiben geöffnet werden"
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Konnte »%s« nicht nach »%s« verschieben"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Das Ziel der Verknüpfung »%s« konnte nicht bestimmt werden"
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Der URI »%s« gehört zu keiner gültigen Datei im Papierkorb"
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr "Papierkorb"
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr "Dateien können nicht innerhalb des Papierkorbs verschoben werden"
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Die Datei »%s« konnte nicht umbenannt werden"
+msgid "Failed to load application from file %s"
+msgstr "Konnte die Anwendung aus Datei »%s« nicht starten"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Die Datei »%s« konnte nicht gelöscht werden"
+msgid "Failed to remove \"%s\": %s"
+msgstr "Die Datei »%s« konnte nicht gelöscht werden: %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Operation abgebrochen"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Befehl"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Das Ziel der Verknüpfung »%s« konnte nicht bestimmt werden"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "Der Befehl zum Ausführen des Mime-Handlers"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Kennzeichen"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Die Kennzeichen für den Mime-Handler"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Symbol"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "Das Symbol für den Mime-Handler"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Name"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Der Name für den Mime-Handler"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Die Verknüpfung »%s« konnte nicht erstellt werden"
+msgid "%s document"
+msgstr "%s Dokument"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Die Berechtigungen für »%s« konnte nicht gesetzt werden"
+msgid "The URI \"%s\" is invalid"
+msgstr "Der URI »%s« ist ungültig"
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Verknüpfungen werden nicht unterstützt"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Puffer zu klein um Pfad aufzunehmen"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "Puffer zu klein um URI aufzunehmen"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr "Ungültige Escape-Zeichen"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Größe"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Die gewünschte Vorschaugröße"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Sammle Dateien..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Ungültiger Pfad"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Die Dateiinformationen für »%s« konnte nicht bestimmt werden"
+msgid "Unknown user \"%s\""
+msgstr "Unbekannter Benutzer »%s«"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "Der Einhängepunkt für %s konnte nicht bestimmt werden"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Die spezielle Datei »%s« konnte nicht kopiert werden"
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Konnte keine Verbindung zum HAL Dienst aufbauen: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -503,58 +459,150 @@ msgid "Sort items in descending order"
msgstr "Objekte in aufsteigender Richtung sortieren"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Die Operation konnte nicht gestartet werden"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Konnte »%s« nicht öffnen"
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Konnte »%s« nicht öffnen: %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Kopiere Dateien..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Erstelle Verknüpfungen..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+msgid "Moving files into the trash..."
+msgstr "Dateien werden in den Papierkorb verschoben..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Verschiebe Dateien..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Sind Sie sicher, dass Sie »%s«\n"
+"dauerhaft löschen wollen?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Soll diese %u ausgewählte Datei wirklich\n"
+"dauerhaft gelöscht werden?"
+msgstr[1] ""
+"Sollen diese %u ausgewählten Dateien wirklich\n"
+"dauerhaft gelöscht werden?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr ""
+"Wenn Sie eine Datei oder einen Ordner löschen, gehen die Daten dauerhaft "
+"verloren."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Lösche Dateien..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Erstelle Dateien..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Erstelle Ordner..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr "Alle Dateien und Ordner aus dem Papierkorb löschen?"
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+msgid "_Empty Trash"
+msgstr "Papierkorb l_eeren"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+"Wenn Sie den Papierkorb leeren, werden darin enthaltene Objekte dauerhaft "
+"gelöscht. Beachten Sie, dass Sie auch einzelne Objekte löschen können."
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr "Papierkorb leeren..."
+
+#: ../thunar/thunar-application.c:1318
+#, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Der Herkunftsort von »%s« konnte nicht ermittelt werden"
+
+#: ../thunar/thunar-application.c:1346
+#, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Den Ordner »%s« erstellen?"
+
+#: ../thunar/thunar-application.c:1350
+msgid "C_reate Folder"
+msgstr "_Ordner erstellen"
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+"Der Ordner »%s« existiert nicht mehr, wird allerdings benötigt, um die Datei "
+"»%s« aus dem Papierkorb wieder herzustellen. Soll der Ordner erstellt werden?"
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Die Datei »%s« konnte nicht wieder hergestellt werden"
+
+#: ../thunar/thunar-application.c:1400
+msgid "Restoring files..."
+msgstr "Dateien werden wieder hergestellt..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Die Standardanwendung für »%s« konnte nicht gesetzt werden"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Keine Anwendung ausgewählt"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -563,20 +611,20 @@ msgstr ""
"»%s« zu öffnen."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Andere Anwendung..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Öffnen Mit"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Einen _benutzerdefinierten Befehl benutzen:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -585,40 +633,39 @@ msgstr ""
"der obigen Liste enthalten ist."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Durchsuchen..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Standardmäßig für Dateien dieses Typs benutzen"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Die Anwendung »%s« konnte nicht hinzugefügt werden"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Die Datei »%s« konnte nicht ausgeführt werden"
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "Starter _entfernen"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "<i>%s</i> und andere Dateien vom Typ »%s« öffnen mit:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -626,8 +673,7 @@ msgstr ""
"Das Dateisystem durchsuchen, um eine Anwendung auszuwählen, mit der Dateien "
"vom Typ »%s« geöffnet werden können."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -636,12 +682,12 @@ msgstr ""
"Die ausgewählte Anwendung soll standardmäßig zum Öffnen von Dateien des Typs "
"»%s« benutzt werden."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Sind Sie sicher, dass Sie »%s« entfernen wollen?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -656,39 +702,39 @@ msgstr ""
"benutzerdefinierte Befehle im »Öffnen Mit« Dialog des Dateimanagers erstellt "
"wurden."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Anwendung auswählen"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Alle Dateien"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Ausführbare Dateien"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perl Skripte"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Python Skripte"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Ruby Skripte"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shell Skripte"
@@ -708,7 +754,7 @@ msgid "Other Applications"
msgstr "Andere Anwendungen"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr ""
"In der Zwischenablage befindet sich nichts was hier eingefügt werden könnte"
@@ -778,14 +824,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "Listenspalten automatisch ver_größern"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Unbekannt"
@@ -797,7 +844,7 @@ msgstr "Listenbasierte Ordneransicht"
msgid "Compact view"
msgstr "Listenansicht"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Neuen Namen eingeben:"
@@ -825,7 +872,7 @@ msgstr "Detaillierte Ordneransicht"
msgid "Details view"
msgstr "Detailansicht"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr ""
"Benedikt Meurer <benny@xfce.org>\n"
@@ -834,10 +881,26 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Die Dokumentation konnte nicht angezeigt werden"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Ja"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Ja zu _allen"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Nein"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "Hierher _kopieren"
@@ -892,7 +955,7 @@ msgstr "Besitzer"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Berechtigungen"
@@ -908,14 +971,10 @@ msgstr "Datei"
msgid "File Name"
msgstr "Dateiname"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Der Wurzelordner hat keinen übergeordneten Ordner"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Dateisystem"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -951,14 +1010,14 @@ msgstr "Symbolansicht"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "Ö_ffnen"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "In neuem Fenster öffnen"
@@ -1098,12 +1157,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Die ausgewählte Datei an »%s« senden"
msgstr[1] "Die ausgewählten Dateien an »%s« senden"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "Verknüpfung (fehlerhaft)"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1111,83 +1170,101 @@ msgstr[0] "%d Objekt (%s), Freier Speicher: %s"
msgstr[1] "%d Objekte (%s), Freier Speicher: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d Objekt, Freier Speicher: %s"
msgstr[1] "%d Objekte, Freier Speicher: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d Objekt"
msgstr[1] "%d Objekte"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "»%s« Verknüpfung (fehlerhaft)"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "»%s« (%s) Verknüpfung mit %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "»%s« (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr "Herkunftsort:"
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Bildgröße:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d Objekt ausgewählt (%s)"
msgstr[1] "%d Objekte ausgewählt (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d Objekt ausgewählt"
msgstr[1] "%d Objekte ausgewählt"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Abstand"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Der Abstand zwischen den Knöpfen für die Pfade"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Ordner »%s« in diesem Fenster darstellen"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Ordner »%s« in einem neuen Fenster darstellen"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Neuen Ordner in »%s« erstellen"
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Neuen _Ordner erstellen..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr "Alle Dateien und Ordner aus dem Papierkorb löschen"
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1195,29 +1272,29 @@ msgstr ""
"Zuvor durch »Ausschneiden« oder »Kopieren« ausgewählte Dateien nach »%s« "
"verschieben oder kopieren"
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "In Ordner einfügen"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Die Eigenschaften des Ordners »%s« anzeigen"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Eigenschaften"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Neuer Ordner"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Neuen Ordner erstellen"
@@ -1234,11 +1311,11 @@ msgstr "_Ort:"
msgid "Failed to launch \"%s\""
msgstr "Konnte »%s« nicht ausführen"
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Symbolgröße"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Die Symbolgröße für das Pfadfeld"
@@ -1324,17 +1401,15 @@ msgid "Stop applying permissions recursively."
msgstr "Rekursives Anwenden der neuen Berechtigungen abbrechen."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Frage"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Rekursiv anwenden?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
@@ -1342,11 +1417,11 @@ msgstr ""
"Möchten Sie Ihre Änderungen rekursiv auf alle\n"
"Dateien und Unterordner anwenden?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "In Zukunft _nicht mehr nachfragen"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1357,29 +1432,29 @@ msgstr ""
"ändern."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Die Gruppe konnte nicht geändert werden"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Die neuen Berechtigungen konnten nicht übernommen werden"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Unbekannter Dateibesitzer"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Ordner-Berechtigungen automatisch korrigieren?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Ordner-Berechtigungen korrigieren"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1389,77 +1464,57 @@ msgstr ""
"überführt. Anschließend können nur Benutzer, die den Inhalt dieses Ordners "
"lesen dürfen, diesen Ordner auch betreten."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Ja"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Ja zu _allen"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Nein"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Abbrechen"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Dateimanager Einstellungen"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Ansichten"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Standardansicht"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "_Neue Fenster öffnen mit:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Symbolansicht"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Detailansicht"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Listenansicht"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Zuletzt aktiver Ansicht"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "_Ordner vor Dateien anzeigen"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Wird diese Einstellung ausgewählt, werden Ordner grundsätzlich vor allen "
"anderen Dateien angezeigt."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "_Miniatur-Vorschaubilder anzeigen"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1468,11 +1523,11 @@ msgstr ""
"kann, innerhalb eines Ordners als automatisch erzeugte Vorschausymbole "
"darzustellen."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Text neben Symbolen"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1483,58 +1538,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Seitenleiste"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Lesezeichenliste"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_Symbolgröße"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Sehr klein"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Kleiner"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Klein"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normal"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Groß"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Größer"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Sehr groß"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "_Embleme für Lesezeichen anzeigen"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1542,19 +1597,19 @@ msgstr ""
"Zeige Embleme in der Lesezeichenliste für alle Ordner, für die im "
"Dateieigenschaftendialog Embleme ausgewählt wurden."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Baumansicht"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Symbol_größe"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Embleme für _Ordner anzeigen"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1565,16 +1620,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Verhalten"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr "Navigation"
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "_Einfacher Klick zum Aktivieren von Objekten"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1582,7 +1640,7 @@ msgstr ""
"Wählen Sie die _Zeit nach der das Objekt, über dem\n"
"sich der Mauszeiger befindet, automatisch ausgewählt wird:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1595,34 +1653,34 @@ msgstr ""
"abstellen, indem Sie den Schieber ganz nach links bewegen. Dieses Verhalten "
"ist nützlich, um Einträge nur auszuwählen anstatt sie zu aktivieren."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Deaktiviert"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Mittel"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Lang"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Doppelklick zum Aktivieren von Objekten"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Fortgeschritten"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Ordner-Berechtigungen"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1633,182 +1691,186 @@ msgstr ""
"angewandt werden. Das Standardverhalten kann\n"
"hier festgelegt werden:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Jedes mal nachfragen"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Nur auf Ordner anwenden"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Auf Ordner und Inhalt anwenden"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu Stunde verbleibend)"
msgstr[1] "(%lu Stunden verbleibend)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu Minute verbleibend)"
msgstr[1] "(%lu Minuten verbleibend)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(%lu Sekunde verbleibend)"
msgstr[1] "(%lu Sekunden verbleibend)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Allgemein"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Name:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Typ:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Öffnen mit:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Verknüpfungsziel:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+msgid "Deleted:"
+msgstr "Gelöscht:"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Geändert:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Zugegriffen:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Größe:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Gerät:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Freier Speicher:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Embleme"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Eigenschaften"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Die Datei »%s« konnte nicht umbenannt werden"
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Datei"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "_Senden an"
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Dateimenü"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "Dateien _hinzufügen..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr ""
"Weitere Dateien zur Liste hinzufügen, die ebenfalls umbenannt werden sollen"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Liste leeren"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Die Liste der unten angezeigten Dateien leeren"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "Ü_ber"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Würdigungen für die Schöpfer von Thunar Bulk-Rename anzeigen"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Eigenschaften..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Die Eigenschaften der ausgewählten Datei anzeigen/ändern"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Mehrere Dateien gleichzeitig umbenennen"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "Dateien _umbenennen"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
"Die Umbenennung der Datei durchführen, wie oben in der Vorschau angezeigt."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Neuer Name"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr "Die Dokumentation für den ausgewählten Umbenennungsmodus anzeigen."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1823,30 +1885,30 @@ msgstr ""
"ist."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Die umzubenennenden Dateien auswählen"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Audiodateien"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Bilddateien"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Videodateien"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Bulk-Rename"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1854,13 +1916,13 @@ msgstr ""
"Thunar Bulk-Rename ist ein mächtiges, erweiterbares\n"
"Werkzeug zum gleichzeitigen Umbenennen mehrerer Dateien."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Datei _entfernen"
msgstr[1] "Dateien _entfernen"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] ""
@@ -1870,7 +1932,7 @@ msgstr[1] ""
"entfernen"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Bulk-Rename - Mehrere Dateien gleichzeitig umbenennen"
@@ -1919,120 +1981,120 @@ msgstr[0] "Neues Lesezeichen für den ausgewählten Ordner erstellen"
msgstr[1] "Neue Lesezeichen für die ausgewählten Ordner erstellen"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "Gerät _Einbinden"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "Medium _Auswerfen"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "Gerät _Auslösen"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "Lesezeichen _enfernen"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Lesezeichen _umbenennen"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Der Pfad »%s« verweist nicht auf einen Ordner"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Neues Lesezeichen konnte nicht hinzugefügt werden"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Das Medium in »%s« konnte nicht ausgeworfen werden"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Das Medium »%s« konnte nicht eingebunden werden"
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Das Medium »%s« konnte nicht ausgelöst werden"
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
-msgstr "Hier klicken um die Berechnung der Verzeichnisgröße abzubrechen."
+msgstr "Hier klicken um die Berechnung der Ordnergröße abzubrechen."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Berechnung abgebrochen"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Berechne..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s Byte"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u Objekt der Gesamtgröße %s"
msgstr[1] "%u Objekte der Gesamtgröße %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Ordnermenü"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Einen neuen, leeren Ordner im aktuellen Ordner erstellen"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "_Ausschneiden"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Kopieren"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "E_infügen"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Zuvor durch »Ausschneiden« oder »Kopieren« ausgewählte Dateien verschieben "
"oder kopieren"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Löschen"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2040,129 +2102,99 @@ msgstr ""
"Zuvor durch »Ausschneiden« oder »Kopieren« ausgewählte Dateien in den "
"gewählten Ordner verschieben oder kopieren"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Alles au_swählen"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Alle Dateien in diesem Fenster auswählen"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "_Muster auswählen..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Alle Dateien auswählen, die einem bestimmten Muster entsprechen"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "_Duplizieren"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "_Verknüpfung erstellen"
msgstr[1] "_Verknüpfungen erstellen"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Umbenennen..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Ausgewählte Dateien umbenennen"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr "_Wiederherstellen"
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Neues _Dokument erstellen"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Ordnerinhalt wird geladen..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Leere Datei"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Neue leere Datei..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Dokument aus Vorlage »%s« erstellen"
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Sind Sie sicher, dass Sie »%s«\n"
-"dauerhaft löschen wollen?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Soll diese %u ausgewählte Datei wirklich\n"
-"dauerhaft gelöscht werden?"
-msgstr[1] ""
-"Sollen diese %u ausgewählten Dateien wirklich\n"
-"dauerhaft gelöscht werden?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr ""
-"Wenn Sie eine Datei oder einen Ordner löschen, gehen die Daten dauerhaft "
-"verloren."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Muster auswählen"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "Aus_wählen"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Muster:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "»%s« umbenennen"
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "Ungültiger Dateinamen von XDS Drag Site gesendet"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Eine Verknüpfung für die Adresse »%s« konnte nicht erzeugt werden"
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Der Ordner »%s« konnte nicht geöffnet werden"
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] ""
@@ -2170,7 +2202,7 @@ msgstr[0] ""
msgstr[1] ""
"Die ausgewählten Dateien beim nächsten »Einfügen« an neuen Ort verschieben"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] ""
@@ -2178,24 +2210,36 @@ msgstr[0] ""
msgstr[1] ""
"Die ausgewählten Dateien beim nächsten »Einfügen« an neuen Ort kopieren"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Ausgewählte Datei dauerhaft löschen"
-msgstr[1] "Ausgewählte Dateien dauerhaft löschen"
+#: ../thunar/thunar-standard-view.c:3349
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Die ausgewählte Datei löschen"
+msgstr[1] "Die ausgewählten Dateien löschen"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
-msgstr[0] "Ausgewählte Datei duplizieren"
-msgstr[1] "Ausgewählte Dateien duplizieren"
+msgstr[0] "Die ausgewählte Datei duplizieren"
+msgstr[1] "Die ausgewählten Dateien duplizieren"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Eine symbolische Verknüpfung für die ausgewählte Datei erstellen"
msgstr[1] "Eine symbolische Verknüpfung für jede ausgewählte Datei erstellen"
+#: ../thunar/thunar-standard-view.c:3380
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Die ausgewählte Datei umbenennen"
+msgstr[1] "Die ausgewählten Dateien umbenennen"
+
+#: ../thunar/thunar-standard-view.c:3388
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Die ausgewählte Datei wiederherstellen"
+msgstr[1] "Die ausgewählten Dateien wiederherstellen"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Anlegen"
@@ -2214,20 +2258,30 @@ msgstr "Keine Vorlagen installiert"
msgid "_Empty File"
msgstr "_Leere Datei"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Wird geladen..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "In Ordner e_infügen"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "_Eigenschaften..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr "Heute"
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr "Gestern"
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "_Neues Fenster öffnen"
@@ -2657,23 +2711,23 @@ msgid "Shutter Speed:"
msgstr "Verschlußgeschw.:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr "ISO Geschw.:"
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Software:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Bild"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Bildtyp:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Bildgröße:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2854,21 +2908,21 @@ msgstr "Ungültiger regulärer Ausdruck, Fehler an Zeichenposition %ld: %s"
msgid "Search & Replace"
msgstr "Suchen & Ersetzen"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "»%s« als komprimiertes Archiv senden?"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "_Direkt senden"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "_Komprimiert senden"
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
@@ -2878,18 +2932,18 @@ msgstr ""
"direkt an die E-Mail angehängt werden, oder vorher komprimiert werden. Für "
"größere Dateien wird empfohlen, die Dateien vorher zu komprimieren."
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] "%d Datei als komprimiertes Archiv senden?"
msgstr[1] "%d Dateien als komprimiertes Archiv senden?"
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "Als A_rchiv senden"
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2903,28 +2957,28 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "Dateien werden komprimiert..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "ZIP Kommando abgebrochen mit Fehler %d"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
-msgstr "Temporäres Verzeichnis konnte nicht erstellt werden"
+msgstr "Temporärer Ordner konnte nicht erstellt werden"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Verknüpfung für »%s« konnte nicht erstellt werden"
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2932,7 +2986,7 @@ msgstr[0] "%d Datei konnte nicht komprimiert werden"
msgstr[1] "%d Dateien konnten nicht komprimiert werden"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "Konnte neue Email nicht erstellen"
@@ -2940,6 +2994,32 @@ msgstr "Konnte neue Email nicht erstellen"
msgid "Mail Recipient"
msgstr "E-Mail-Empfänger"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+msgid "Failed to connect to the Trash"
+msgstr "Konnte keine Verbindung zum Papierkorb aufbauen"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr "Papierkorb ist voll"
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr "Papierkorb ist leer"
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr "Schneller Zugriff auf den Papierkorb"
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr "Papierkorb"
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Benutzerdefinierte Aktionen"
@@ -3179,11 +3259,11 @@ msgstr ""
msgid "Unknown closing element <%s>"
msgstr "Unbekanntes schließendes Element <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Konnte den Speicherort für »uca.xml« nicht bestimmen"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Befehl nicht angegeben"
@@ -3234,3 +3314,87 @@ msgstr "Ordner in Thunar öffnen"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Angegebene Ordner mit Thunar öffnen"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Ausgewählte Datei dauerhaft löschen"
+#~ msgstr[1] "Ausgewählte Dateien dauerhaft löschen"
+
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Die Berechtigungen von »%s« konnte nicht geändert werden"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Wollen Sie diese überspringen?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Die Dateiinformationen für »%s« konnten nicht bestimmt werden: %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "Die Datei »%s« existiert bereits. Wollen Sie die Datei durch eine leere "
+#~ "Datei ersetzen?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Konnte »%s« nicht löschen.\n"
+#~ "\n"
+#~ "Wollen Sie diese Datei überspringen?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Konnte leere Datei »%s« nicht erstellen.\n"
+#~ "\n"
+#~ "Wollen Sie diese überspringen?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Dateiinformationen für »%s« konnten nicht bestimmt werden: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Möchten Sie diese überschreiben?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Konnte Ordner »%s« nicht erstellen: %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Ordner werden gelöscht..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Der Ordner »%s« konnte nicht gelöscht werden: %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Der Wurzelordner kann nicht verschoben oder kopiert werden"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Named Pipes werden nicht unterstützt"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Operation abgebrochen"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Das Ziel der Verknüpfung »%s« konnte nicht bestimmt werden"
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Die Berechtigungen für »%s« konnte nicht gesetzt werden"
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Die spezielle Datei »%s« konnte nicht kopiert werden"
diff --git a/po/el.po b/po/el.po
index f88c4b1cbf7457909a22cc89792a796f01730689..3d190d9f48da9625b5e6a9a79b8a2d2cc11614a5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-07-07 23:12+0200\n"
"Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -19,375 +19,331 @@ msgstr ""
"X-Poedit-Country: GREECE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Συλλογή αÏχείων..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"ΘÎλετε να το Ï€ÏοσπεÏάσετε;"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Ο Ï€ÏοσδιοÏισμός των πληÏοφοÏιών για το αÏχείο \"%s\" απÎτυχε: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Η αλλαγή των δικαιωμάτων του \"%s\" απÎτυχε: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Η αλλαγή του ιδιοκτήτη του \"%s\" απÎτυχε: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Η αλλαγή της ομάδας του \"%s\" απÎτυχε: %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr ""
-"Το αÏχείο \"%s\" υπάÏχει ήδη. ΘÎλετε να το αντικαταστήσετε με Îνα κενό "
-"αÏχείο;"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Δεν ήταν δυνατή η διαγÏαφή του \"%s\".\n"
-"\n"
-"ΘÎλετε να το Ï€ÏοσπεÏάσετε;"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Δεν ήταν δυνατή η δημιουÏγία του ÎºÎµÎ½Î¿Ï Î±Ïχείου \"%s\".\n"
-"\n"
-"ΘÎλετε να το Ï€ÏοσπεÏάσετε;"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Η λήψη των πεÏιεχομÎνων του φακÎλου απÎτυχε"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Άγνωστο σφάλμα"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Δεν Îχει οÏιστεί το πεδίο Exec"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Δεν Îχει οÏιστεί το πεδίο URL"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Μη ÎγκυÏο αÏχείο συντόμευσης"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Δεν ήταν δυνατή η ανάγνωση του αÏχείου"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Μη ÎγκυÏο όνομα αÏχείου"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Δεν ήταν δυνατή η λήψη της κατάστασης του αÏχείου \"%s\": %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"ΘÎλετε να αντικατασταθεί;"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Η διαγÏαφή του \"%s\" απÎτυχε: %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Η φόÏτωση της εφαÏμογής από το αÏχείο %s απÎτυχε"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Εντολή"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "Η εντολή για να εκτελεστεί ο χειÏιστής mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Σημαίες"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Οι σημαίες του χειÏιστή mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Εικονίδιο"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Επιλογή αÏχείων για μετονομασία"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "Το εικονίδιο του χειÏιστή mime"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Î Ïοετοιμασία..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Όνομα"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Η αλλαγή των δικαιωμάτων του \"%s\" απÎτυχε: %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Το όνομα του χειÏιστή mime"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Η αλλαγή του ιδιοκτήτη του \"%s\" απÎτυχε: %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "ÎγγÏαφο %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Η αλλαγή της ομάδας του \"%s\" απÎτυχε: %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Η δημιουÏγία του καταλόγου \"%s\" απÎτυχε: %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Η διαδÏομή είναι υπεÏβολικά μεγάλη για να χωÏÎσει στην Ï€ÏοσωÏινή μνήμη"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "Το URI είναι υπεÏβολικά μεγάλο για να χωÏÎσει στην Ï€ÏοσωÏινή μνήμη"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "ÎœÎγεθος"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Το επιθυμητό μÎγεθος μικÏογÏαφιών"
+msgid "The file \"%s\" already exists"
+msgstr "Το αÏχείο \"%s\" υπάÏχει ήδη"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "ΔιαγÏαφή καταλόγων..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Δεν ήταν δυνατή η δημιουÏγία της διασωλήνωσης \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Δεν ήταν δυνατή η διαγÏαφή του καταλόγου \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Δεν είναι δυνατή η μεταφοÏά του ÏÎ¹Î¶Î¹ÎºÎ¿Ï (root) καταλόγου"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Î Ïοετοιμασία..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Το άνοιγμα του \"%s\" για ανάγνωση απÎτυχε"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Μη ÎγκυÏη διαδÏομή"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Το άνοιγμα του \"%s\" για εγγÏαφή απÎτυχε"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Άγνωστος χÏήστης \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "Η εγγÏαφή δεδομÎνων στο \"%s\" απÎτυχε"
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Ο Ï€ÏοσδιοÏισμός του σημείου σÏνδεσης για το `%s' απÎτυχε"
+msgid "Failed to remove \"%s\""
+msgstr "Η διαγÏαφή του \"%s\" απÎτυχε"
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "ΑπÎτυχε η σÏνδεση με το δαίμονα HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Η ανάγνωση δεδομÎνων από το \"%s\" απÎτυχε"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "αντίγÏαφο του %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "δεσμός Ï€Ïος το %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "άλλο αντίγÏαφο του %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "άλλος δεσμός Ï€Ïος το %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "Ï„Ïίτο αντίγÏαφο του %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "Ï„Ïίτος δεσμός Ï€Ïος το %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%uο αντίγÏαφο του %s"
msgstr[1] "%uο αντίγÏαφο του %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%uος δεσμός Ï€Ïος το %s"
msgstr[1] "%uος δεσμός Ï€Ïος το %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Ο Ï€ÏοσδιοÏισμός των πληÏοφοÏιών αÏχείου για το \"%s\" απÎτυχε"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Η δημιουÏγία του καταλόγου \"%s\" απÎτυχε"
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Δεν ήταν δυνατή η δημιουÏγία της διασωλήνωσης \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Δεν υποστηÏίζονται διασωληνώσεις"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Το άνοιγμα του \"%s\" για ανάγνωση απÎτυχε"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Η δημιουÏγία ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï Î´ÎµÏƒÎ¼Î¿Ï \"%s\" απÎτυχε"
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Το αÏχείο \"%s\" υπάÏχει ήδη"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Το άνοιγμα του \"%s\" για εγγÏαφή απÎτυχε"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Δεν υποστηÏίζονται συμβολικοί δεσμοί"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Η ανάγνωση δεδομÎνων από το \"%s\" απÎτυχε"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "ΣÏστημα αÏχείων"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Η μετονομασία του \"%s\" σε \"%s\" απÎτυχε."
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Η μετονομασία του \"%s\" σε \"%s\" απÎτυχε."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Η μετονομασία του \"%s\" σε \"%s\" απÎτυχε."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Η διαδÏομή \"%s\" δεν αντιστοιχεί σε κατάλογο"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Η εγγÏαφή δεδομÎνων στο \"%s\" απÎτυχε"
+msgid "Failed to load application from file %s"
+msgstr "Η φόÏτωση της εφαÏμογής από το αÏχείο %s απÎτυχε"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Η διαγÏαφή του \"%s\" απÎτυχε"
+msgid "Failed to remove \"%s\": %s"
+msgstr "Η διαγÏαφή του \"%s\" απÎτυχε: %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Η ενÎÏγεια ακυÏώθηκε"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Εντολή"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Η ανάγνωση του ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï Î´ÎµÏƒÎ¼Î¿Ï \"%s\" απÎτυχε"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "Η εντολή για να εκτελεστεί ο χειÏιστής mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Σημαίες"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Οι σημαίες του χειÏιστή mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Εικονίδιο"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "Το εικονίδιο του χειÏιστή mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Όνομα"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Το όνομα του χειÏιστή mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Η δημιουÏγία ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï Î´ÎµÏƒÎ¼Î¿Ï \"%s\" απÎτυχε"
+msgid "%s document"
+msgstr "ÎγγÏαφο %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Η αλλαγή της κατάστασης του \"%s\" απÎτυχε"
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Δεν υποστηÏίζονται συμβολικοί δεσμοί"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Η διαδÏομή είναι υπεÏβολικά μεγάλη για να χωÏÎσει στην Ï€ÏοσωÏινή μνήμη"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "Το URI είναι υπεÏβολικά μεγάλο για να χωÏÎσει στην Ï€ÏοσωÏινή μνήμη"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "ÎœÎγεθος"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Το επιθυμητό μÎγεθος μικÏογÏαφιών"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Συλλογή αÏχείων..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Μη ÎγκυÏη διαδÏομή"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Ο Ï€ÏοσδιοÏισμός των πληÏοφοÏιών αÏχείου για το \"%s\" απÎτυχε"
+msgid "Unknown user \"%s\""
+msgstr "Άγνωστος χÏήστης \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "H αντιγÏαφή του ÎµÎ¹Î´Î¹ÎºÎ¿Ï Î±Ïχείου \"%s\" ήταν αδÏνατη"
+msgid "Failed to determine the mount point for %s"
+msgstr "Ο Ï€ÏοσδιοÏισμός του σημείου σÏνδεσης για το `%s' απÎτυχε"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "ΑπÎτυχε η σÏνδεση με το δαίμονα HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -504,58 +460,148 @@ msgid "Sort items in descending order"
msgstr "Ταξινόμηση καÏτελών με φθίνουσα σειÏά"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Η εκκίνηση της ενÎÏγειας απÎτυχε"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Το άνοιγμα του \"%s\" απÎτυχε"
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Η διαγÏαφή του \"%s\" απÎτυχε: %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "ΑντιγÏαφή αÏχείων..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "ΔημιουÏγία συμβολικών δεσμών..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Μετακίνηση αÏχείων..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Μετακίνηση αÏχείων..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Είστε σίγουÏος/η ότι θÎλετε να διαγÏάψετε\n"
+"οÏιστικά το \"%s\";"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Είστε σίγουÏος/η ότι θÎλετε να διαγÏάψετε\n"
+"οÏιστικά το επιλεγμÎνο αÏχείο;"
+msgstr[1] ""
+"Είστε σίγουÏος/η ότι θÎλετε να διαγÏάψετε\n"
+"οÏιστικά τα %u επιλεγμÎνα αÏχεία;"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Εάν διαγÏάψετε Îνα αÏχείο, χάνεται για πάντα."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "ΔιαγÏαφή αÏχείων..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "ΔημιουÏγία αÏχείων..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "ΔημιουÏγία καταλόγων..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "_Κενό αÏχείο"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Ο Ï€ÏοσδιοÏισμός του σημείου σÏνδεσης για το `%s' απÎτυχε"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "ΔημιουÏγία νÎου φακÎλου στο \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "ΔημιουÏγία _φακÎλου..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Η διαγÏαφή του \"%s\" απÎτυχε"
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "ΔιαγÏαφή αÏχείων..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Ο οÏισμός της Ï€ÏοκαθοÏισμÎνης εφαÏμογής για το \"%s\" απÎτυχε"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Δεν επιλÎχθηκε εφαÏμογή"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -564,20 +610,20 @@ msgstr ""
"Ï„Ïπου \"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Άλλη εφαÏμογή..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Άνοιγμα με"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "ΧÏήση _Ï€ÏοσαÏμοσμÎνης εντολής:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -586,40 +632,39 @@ msgstr ""
"παÏαπάνω λίστα."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_ΠεÏιήγηση..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "ΧÏήση ως εξ _οÏÎ¹ÏƒÎ¼Î¿Ï Î³Î¹Î± αυτό τον Ï„Ïπο αÏχείου"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Η Ï€Ïοσθήκη της εφαÏμογής \"%s\" απÎτυχε"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Η εκτÎλεση του \"%s\" απÎτυχε"
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "_ΑπομάκÏυνση εκκινητή"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Άνοιγμα του <i>%s</i> και των άλλων αÏχείων του Ï„Ïπου \"%s\" με:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -627,8 +672,7 @@ msgstr ""
"ΕÏευνήστε το σÏστημα αÏχείων για να επιλÎξετε την εφαÏμογή που θα "
"χÏησιμοποιείτε για το άνοιγμα των αÏχείων Ï„Ïπου \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -637,12 +681,12 @@ msgstr ""
"Αλλαγή της Ï€ÏοεπιλεγμÎνης εφαÏμογής για το άνοιγμα αÏχείων Ï„Ïπου \"%s\" στην "
"επιλεγμÎνη εφαÏμογή."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Είστε σίγουÏος/η ότι θÎλετε να διαγÏάψετε το \"%s\";"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -656,39 +700,39 @@ msgstr ""
"ΜποÏείτε να αφαιÏÎσετε μόνο εκκινητÎÏ‚ που δημιουÏγήθηκαν από το πλαίσιο "
"Ï€ÏοσαÏμοσμÎνης εντολής του διαλόγου \"Άνοιγμα με\" του διαχειÏιστή αÏχείων."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Επιλογή εφαÏμογής"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Όλα τα αÏχεία"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "ΕκτελÎσιμα αÏχεία"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "ΔÎσμες ενεÏγειών Perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "ΔÎσμες ενεÏγειών Python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "ΔÎσμες ενεÏγειών Ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "ΔÎσμες ενεÏγειών κÎλυφους"
@@ -708,7 +752,7 @@ msgid "Other Applications"
msgstr "Άλλες εφαÏμογÎÏ‚"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Δεν υπάÏχει τίποτα στο Ï€ÏόχειÏο για να επικολληθεί"
@@ -776,14 +820,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "Αυτόματη _επÎκταση στηλών"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Άγνωστο"
@@ -795,7 +840,7 @@ msgstr "Î Ïοβολή καταλόγου ως λίστα εικονιδίων"
msgid "Compact view"
msgstr "Λίστα"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Εισάγετε νÎο όνομα:"
@@ -823,7 +868,7 @@ msgstr "ΛεπτομεÏής απεικόνιση καταλόγων"
msgid "Details view"
msgstr "Î Ïοβολή λεπτομεÏειών"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr ""
"ΣταÏÏος ΓιαννοÏÏης <stavrosg2002@freemail.gr>\n"
@@ -831,10 +876,26 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Το άνοιγμα του αναγνώστη τεκμηÏίωσης απÎτυχε"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Îαι"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Îαι σε ÏŒ_λα"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Όχι"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_ΑκÏÏωση"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_ΑντιγÏαφή εδώ"
@@ -889,7 +950,7 @@ msgstr "Ιδιοκτήτης"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Δικαιώματα"
@@ -905,14 +966,10 @@ msgstr "ΑÏχείο"
msgid "File Name"
msgstr "Όνομα αÏχείου"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Ο Ïιζικός φάκελος δεν Îχει γονεϊκό φάκελο"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "ΣÏστημα αÏχείων"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -948,14 +1005,14 @@ msgstr "Εικονίδια"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Άνοιγμα"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Άνοιγμα σε νÎο παÏάθυÏο"
@@ -1093,12 +1150,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Αποστολή επιλεγμÎνου αÏχείου στο \"%s\""
msgstr[1] "Αποστολή επιλεγμÎνων αÏχείων στο \"%s\""
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "σπασμÎνος δεσμός"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1106,83 +1163,101 @@ msgstr[0] "%d αντικείμενο (%s), ΕλεÏθεÏος χώÏος: %s"
msgstr[1] "%d αντικείμενα (%s), ΕλεÏθεÏος χώÏος: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d αντικείμενο, ΕλεÏθεÏος χώÏος: %s"
msgstr[1] "%d αντικείμενα, ΕλεÏθεÏος χώÏος: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d αντικείμενο"
msgstr[1] "%d αντικείμενα"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "σπασμÎνος δεσμός \"%s\""
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) δεσμός Ï€Ïος το %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "ÎœÎγεθος εικόνας:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d επιλεγμÎνο αντικείμενο (%s)"
msgstr[1] "%d επιλεγμÎνα αντικείμενα (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d επιλεγμÎνο αντικείμενο"
msgstr[1] "%d επιλεγμÎνα αντικείμενα"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Διάστιχο"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Το μÎγεθος του διαστήματος Î¼ÎµÏ„Î±Î¾Ï ÎºÎ¿Ï…Î¼Ï€Î¹ÏŽÎ½ διαδÏομής"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Άνοιγμα του \"%s\" σε αυτό το παÏάθυÏο"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Άνοιγμα του \"%s\" σε νÎο το παÏάθυÏο"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "ΔημιουÏγία νÎου φακÎλου στο \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "ΔημιουÏγία _φακÎλου..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1190,29 +1265,29 @@ msgstr ""
"Μετακίνηση ή αντιγÏαφή αÏχείων που Ï€ÏοηγουμÎνως επιλÎχθηκαν με εντολή "
"Αποκοπή αÏχείων ή ΑντιγÏαφή αÏχείων στο \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Επικόλληση στο φάκελο"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Î Ïοβολή των ιδιοτήτων του φακÎλου \"%s\""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Ιδιότητες"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "ÎÎος φάκελος"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "ΔημιουÏγία νÎου φακÎλου"
@@ -1229,11 +1304,11 @@ msgstr "_Τοποθεσία:"
msgid "Failed to launch \"%s\""
msgstr "Η εκκίνηση του \"%s\" απÎτυχε"
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "ÎœÎγεθος εικονιδίου"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "ÎœÎγεθος εικονιδίου για τη διαδÏομή"
@@ -1316,17 +1391,15 @@ msgid "Stop applying permissions recursively."
msgstr "Διακοπή αναδÏομικής εφαÏμογής δικαιωμάτων."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "ΕÏώτηση"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Îα εφαÏμοστεί και στους υποφακÎλους;"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
@@ -1334,11 +1407,11 @@ msgstr ""
"ΘÎλετε να εφαÏμόσετε τις αλλαγÎÏ‚ σας σε όλα τα αÏχεία\n"
"και υποφακÎλους που βÏίσκονται μÎσα στον επιλεγμÎνο;"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "Μη_ν με ξαναÏωτήσεις"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1349,29 +1422,29 @@ msgstr ""
"αÏγότεÏα."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Η αλλαγή ομάδας απÎτυχε"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Η εφαÏμογή των νÎων δικαιωμάτων απÎτυχε"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Άγνωστος ιδιοκτήτης αÏχείου"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Îα γίνει αυτόματη επιδιόÏθωση δικαιωμάτων φακÎλου;"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "ΕπιδιόÏθωση δικαιωμάτων φακÎλου"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1380,77 +1453,57 @@ msgstr ""
"Θα επαναφεÏθεί η συνοχή των δικαιωμάτων του φακÎλου. Μόνο οι χÏήστες που "
"Îχουν δικαίωμα ανάγνωσης των πεÏιεχομÎνων θα Îχουν και Ï€Ïόσβαση στο φάκελο."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Îαι"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Îαι σε ÏŒ_λα"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Όχι"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_ΑκÏÏωση"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Î Ïοτιμήσεις διαχειÏιστή αÏχείων"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Î ÏοβολÎÏ‚"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Î ÏοκαθοÏισμÎνη Ï€Ïοβολή"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Î Ïοβολή _νÎων φακÎλων με χÏήση:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Εικονίδια"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "ΛεπτομÎÏειες"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Λίστα"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Τελευταία ενεÏγή Ï€Ïοβολή"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Ταξινόμηση _φακÎλων Ï€Ïιν τα αÏχεία"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"ΕπιλÎξτε αυτό για να τοποθετοÏνται οι φάκελοι Ï€Ïιν από τα αÏχεία κατά την "
"ταξινόμηση ενός φακÎλου."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Εμφάνιση _μικÏογÏαφιών:"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1458,11 +1511,11 @@ msgstr ""
"ΕνεÏγοποιήστε αυτή την επιλογή για να δημιουÏγοÏνται και να εμφανίζονται "
"αυτόματα μικÏογÏαφίες όσων αÏχείων γίνεται."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Κείμενο δίπλα από εικονίδια"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1473,58 +1526,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "ΠλευÏικό ταμπλό"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Ταμπλό συντομεÏσεων"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "ÎœÎγεθος ε_ικονιδίων:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Î Î¿Î»Ï Î¼Î¹ÎºÏÏŒ"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "ΜικÏότεÏο"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "ΜικÏÏŒ"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Κανονικό"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Μεγάλο"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "ΜεγαλÏτεÏο"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Î Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Εμφάνιση ε_μβλημάτων εικονιδίων"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1532,19 +1585,19 @@ msgstr ""
"Εμφανίζει τα εμβλήματα στο ταμπλό συντομεÏσεων για όσους φακÎλους Îχουν "
"τεθεί μÎσω των ιδιοτήτων τους."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Ταμπλό δÎντÏου"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "_ÎœÎγεθος εικονιδίου:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Εμφάνιση ε_μβλημάτων εικονιδίων"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1555,16 +1608,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "ΣυμπεÏιφοÏά"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "_Μονό κλικ για την ενεÏγοποίηση αντικειμÎνων"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1572,7 +1628,7 @@ msgstr ""
"ΟÏίστε το _χÏόνο που μεσολαβεί για να επιλεγεί Îνα αντικείμενο\n"
"όταν σταματήσει ο δείκτης του Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï Î±Ï€ÏŒ πάνω του:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1587,34 +1643,34 @@ msgstr ""
"όταν το μονό κλικ ενεÏγοποιεί τα αντικείμενα, και εσείς θÎλετε να τα "
"επιλÎξετε μόνο."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "ΑπενεÏγοποιημÎνο"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Μεσαίο"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "ΜακÏÏ"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Διπλό κλικ για την ενεÏγοποίηση αντικειμÎνων"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Για Ï€ÏοχωÏημÎνους"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Δικαιώματα φακÎλου"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1624,173 +1680,178 @@ msgstr ""
"να εφαÏμόσετε τις αλλαγÎÏ‚ και στα πεÏιεχόμενά του.\n"
"ΕπιλÎξτε την εξ οÏÎ¹ÏƒÎ¼Î¿Ï ÏƒÏ…Î¼Ï€ÎµÏιφοÏά παÏακάτω:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Îα γίνεται πάντα εÏώτηση"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "ΕφαÏμογή μόνο στο φάκελο"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "ΕφαÏμογή στο φάκελο και τα πεÏιεχόμενα"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(απομÎνει %lu ÏŽÏα)"
msgstr[1] "(απομÎνουν %lu ÏŽÏες)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(απομÎνει %lu λεπτό)"
msgstr[1] "(απομÎνουν %lu λεπτά)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(απομÎνει %lu δευτεÏόλεπτο)"
msgstr[1] "(απομÎνουν %lu δευτεÏόλεπτα)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "ΓενικÎÏ‚"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Όνομα:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Είδος:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Άνοιγμα με:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Î ÏοοÏισμός δεσμοÏ:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_ΔιαγÏαφή"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "ΤÏοποποιήθηκε:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Î Ïοσπελάστηκε:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "ÎœÎγεθος:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Τόμος:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "ΕλεÏθεÏος χώÏος:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Εμβλήματα"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Ιδιότητες"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Η μετονομασία του \"%s\" απÎτυχε"
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_ΑÏχείο"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "Απο_στολή Ï€Ïος"
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "ÎœÎµÎ½Î¿Ï ÎµÎ½ÎµÏγειών αÏχείων"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Î Ïοσθήκη αÏχείων..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "ΠεÏίληψη επί πλÎον αÏχείων στη λίστα αÏχείων Ï€Ïος μετονομασία"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "ΚαθαÏισμός"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "ΚαθαÏισμός της παÏακάτω λίστας αÏχείων"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_ΠεÏί"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Εμφάνιση πληÏοφοÏιών σχετικά με τη Μαζική μετονομασία του Thunar"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Ιδιότητες..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Î Ïοβολή των ιδιοτήτων του επιλεγμÎνου αÏχείου"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Μετονομασία πολλαπλών αÏχείων"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Μετονομασία αÏχείων"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "Κάντε κλικ εδώ για να μετονομάσετε τα παÏαπάνω αÏχεία."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "ÎÎο όνομα "
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
"Πατήστε εδώ για να δείτε την τεκμηÏίωση της επιλεγμÎνης λειτουÏγίας "
@@ -1799,7 +1860,7 @@ msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1811,30 +1872,30 @@ msgstr ""
"ότι θα ενεÏγοποιηθεί το Ï€Ïόσθετο \"Simple Builtin Renamers\"."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Επιλογή αÏχείων για μετονομασία"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "ΑÏχεία ήχου"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "ΑÏχεία εικόνων"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "ΑÏχεία βίντεο"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Μαζική μετονομασία"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1842,13 +1903,13 @@ msgstr ""
"Η μαζική μετονομασία είναι Îνα ισχυÏÏŒ και επεκτάσιμο\n"
"εÏγαλείο για τη μετονομασία πολλών αÏχείων ταυτόχÏονα."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "ΔιαγÏαφή αÏχείου"
msgstr[1] "ΔιαγÏαφή αÏχείων"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] ""
@@ -1857,7 +1918,7 @@ msgstr[1] ""
"ΑφαίÏεση των επιλεγμÎνων αÏχείων από τη λίστα αÏχείων που θα μετονομαστοÏν"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Μαζική μετονομασία - Μετονομασία πολλαπλών αÏχείων"
@@ -1905,120 +1966,120 @@ msgstr[0] "Î Ïοσθήκη του επιλεγμÎνου φακÎλου στη
msgstr[1] "Î Ïοσθήκη των επιλεγμÎνων φακÎλων στη μπάÏα συντομεÏσεων"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "Î Ïο_σάÏτηση τόμου"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "Ε_ξαγωγή τόμου"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "ΑποπÏο_σάÏτηση τόμου"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_ΑπομάκÏυνση συντόμευσης"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Μετο_νομασία συντόμευσης"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Η διαδÏομή \"%s\" δεν αντιστοιχεί σε κατάλογο"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Η Ï€Ïοσθήκη νÎας συντόμευσης απÎτυχε"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Η εξαγωγή του \"%s\" απÎτυχε"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Η Ï€ÏοσάÏτηση του \"%s\" απÎτυχε"
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Η αποπÏοσάÏτηση του \"%s\" απÎτυχε"
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Πατήστε εδώ για να σταματήσει ο υπολογισμός του μεγÎθους του φακÎλου."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Ο υπολογισμός ακυÏώθηκε"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "ΕπεξεÏγασία..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s Bytes"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u αντικείμενο, %s συνολικά"
msgstr[1] "%u αντικείμενα, %s συνολικά"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "ÎœÎµÎ½Î¿Ï ÎµÎ½ÎµÏγειών φακÎλων"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "ΔημιουÏγία ενός άδειου φακÎλου μÎσα στον Ï„ÏÎχοντα φάκελο"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "_Αποκοπή"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "Α_ντιγÏαφή"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "_Επικόλληση"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Μετακίνηση ή αντιγÏαφή αÏχείων που Ï€ÏοηγουμÎνως επιλÎχθηκαν με εντολή "
"Αποκοπή αÏχείων ή ΑντιγÏαφή αÏχείων"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_ΔιαγÏαφή"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2026,127 +2087,99 @@ msgstr ""
"Μετακίνηση ή αντιγÏαφή αÏχείων που Ï€ÏοηγουμÎνως επιλÎχθηκαν με εντολή "
"Αποκοπή αÏχείων ή ΑντιγÏαφή αÏχείων στον επιλεγμÎνο φάκελο"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Επιλογή ÏŒ_λων των αÏχείων"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Επιλογή όλων των αÏχείων σε αυτό το παÏάθυÏο"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Επιλογή _βάσει μοτίβου..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Επιλογή όλων των αÏχείων που ταιÏιάζουν σε Îνα μοτίβο"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "ΔημιουÏγία αν_τιγÏάφου"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "ΔημιουÏγία _δεσμοÏ"
msgstr[1] "ΔημιουÏγία _δεσμών"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Μετονομασία..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Μετονομασία του επιλεγμÎνου αÏχείου"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "ΔημιουÏγία _εγγÏάφου"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "ΦόÏτωμα πεÏιεχομÎνων φακÎλου..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "ÎÎο κενό αÏχείο"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "ÎÎο κενό αÏχείο..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "ΔημιουÏγία εγγÏάφου από Ï€Ïότυπο \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Είστε σίγουÏος/η ότι θÎλετε να διαγÏάψετε\n"
-"οÏιστικά το \"%s\";"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Είστε σίγουÏος/η ότι θÎλετε να διαγÏάψετε\n"
-"οÏιστικά το επιλεγμÎνο αÏχείο;"
-msgstr[1] ""
-"Είστε σίγουÏος/η ότι θÎλετε να διαγÏάψετε\n"
-"οÏιστικά τα %u επιλεγμÎνα αÏχεία;"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Εάν διαγÏάψετε Îνα αÏχείο, χάνεται για πάντα."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Επιλογή βάσει μοτίβου"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "Επιλο_γή"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Μοτίβο:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Μετονομασία \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "Το XDS παÏÎδωσε Îνα μη ÎγκυÏο όνομα αÏχείου"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Δεν ήταν δυνατή η δημιουÏγία Î´ÎµÏƒÎ¼Î¿Ï Î³Î¹Î± τη διεÏθυνση \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Το άνοιγμα του καταλόγου \"%s\" απÎτυχε"
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] ""
@@ -2156,7 +2189,7 @@ msgstr[1] ""
"Î Ïοετοιμασία των επιλεγμÎνων αÏχείων για μετακίνηση με μια εντολή "
"Επικόλλησης αÏχείων"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] ""
@@ -2166,24 +2199,39 @@ msgstr[1] ""
"Î Ïοετοιμασία των επιλεγμÎνων αÏχείων για αντιγÏαφή με μια εντολή "
"Επικόλλησης αÏχείων"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "ΟÏιστική διαγÏαφή του επιλεγμÎνου αÏχείου"
-msgstr[1] "ΟÏιστική διαγÏαφή των επιλεγμÎνων αÏχείων"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "ΔημιουÏγία αντιγÏάφου για το επιλεγμÎνο αÏχείο"
+msgstr[1] "ΔημιουÏγία αντιγÏάφου για κάθε επιλεγμÎνο αÏχείο"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "ΔημιουÏγία αντιγÏάφου για το επιλεγμÎνο αÏχείο"
msgstr[1] "ΔημιουÏγία αντιγÏάφου για κάθε επιλεγμÎνο αÏχείο"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "ΔημιουÏγεί Îνα συμβολικό δεσμό για το επιλεγμÎνο αÏχείο"
msgstr[1] "ΔημιουÏγεί Îνα συμβολικό δεσμό για κάθε επιλεγμÎνο αÏχείο"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Μετονομασία του επιλεγμÎνου αÏχείου"
+msgstr[1] "Μετονομασία του επιλεγμÎνου αÏχείου"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Μετονομασία του επιλεγμÎνου αÏχείου"
+msgstr[1] "Μετονομασία του επιλεγμÎνου αÏχείου"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "ΔημιουÏγία"
@@ -2202,20 +2250,30 @@ msgstr "Δεν υπάÏχουν εγκατεστημÎνα Ï€Ïότυπα"
msgid "_Empty File"
msgstr "_Κενό αÏχείο"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "ΦόÏτωση..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "_Επικόλληση στο φάκελο"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "_Ιδιότητες..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Άνοιγμα νÎου _παÏαθÏÏου"
@@ -2645,23 +2703,23 @@ msgid "Shutter Speed:"
msgstr "ΤαχÏτητα διαφÏάγματος:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Λογισμικό:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Εικόνα"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "ΤÏπος εικόνας:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "ÎœÎγεθος εικόνας:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2837,21 +2895,21 @@ msgstr "Μη ÎγκυÏη κανονική ÎκφÏαση, στη θÎση χα
msgid "Search & Replace"
msgstr "ΕÏÏεση & Αντικατάσταση"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "Îα σταλεί το \"%s\" ως συμπιεσμÎνο αÏχείο;"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "Αποστολή _απευθείας"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "Αποστολή _συμπιεσμÎνου"
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
@@ -2861,18 +2919,18 @@ msgstr ""
"στείλετε απευθείας, είτε να το συμπιÎσετε Ï€Ïιν την επισÏναψη του. Συνιστάται "
"η συμπίεση μεγάλων αÏχείων Ï€Ïιν την αποστολή τους."
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] "Îα αποσταλεί %d αÏχείο ως συμπιεσμÎνο αÏχείο;"
msgstr[1] "Îα αποσταλοÏν %d αÏχεία ως συμπιεσμÎνο αÏχείο;"
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "Αποστολή ως _συμπιεσμÎνου"
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2886,28 +2944,28 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "Συμπίεση αÏχείων..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "Η εντολή ZIP τεÏματίστηκε με το σφάλμα %d"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr "Η δημιουÏγία του Ï€ÏοσωÏÎ¹Î½Î¿Ï ÎºÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… απÎτυχε"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Η δημιουÏγία ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï Î´ÎµÏƒÎ¼Î¿Ï \"%s\" απÎτυχε"
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2915,7 +2973,7 @@ msgstr[0] "Η συμπίεση %d αÏχείου απÎτυχε"
msgstr[1] "Η συμπίεση %d αÏχείων απÎτυχε"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "Δεν ήταν δυνατή η σÏνθεση νÎου email"
@@ -2923,6 +2981,33 @@ msgstr "Δεν ήταν δυνατή η σÏνθεση νÎου email"
msgid "Mail Recipient"
msgstr "ΠαÏαλήπτης"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "ΑπÎτυχε η σÏνδεση με το δαίμονα HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Î ÏοσαÏμοσμÎνες ενÎÏγειες"
@@ -3162,11 +3247,11 @@ msgstr "End element handler called while in root context"
msgid "Unknown closing element <%s>"
msgstr "Άγνωστο στοιχείο κλεισίματος <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Ο Ï€ÏοσδιοÏισμός της τοποθεσίας αποθήκευσης για το uca.xml απÎτυχε"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Η εντολή δεν Îχει Ïυθμιστεί"
@@ -3217,3 +3302,88 @@ msgstr "Άνοιγμα φακÎλου με το Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Άνοιγμα των επιλεγμÎνων φακÎλων στον Thunar"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "ΟÏιστική διαγÏαφή του επιλεγμÎνου αÏχείου"
+#~ msgstr[1] "ΟÏιστική διαγÏαφή των επιλεγμÎνων αÏχείων"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Η αλλαγή των δικαιωμάτων του \"%s\" απÎτυχε: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "ΘÎλετε να το Ï€ÏοσπεÏάσετε;"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Ο Ï€ÏοσδιοÏισμός των πληÏοφοÏιών για το αÏχείο \"%s\" απÎτυχε: %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "Το αÏχείο \"%s\" υπάÏχει ήδη. ΘÎλετε να το αντικαταστήσετε με Îνα κενό "
+#~ "αÏχείο;"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Δεν ήταν δυνατή η διαγÏαφή του \"%s\".\n"
+#~ "\n"
+#~ "ΘÎλετε να το Ï€ÏοσπεÏάσετε;"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Δεν ήταν δυνατή η δημιουÏγία του ÎºÎµÎ½Î¿Ï Î±Ïχείου \"%s\".\n"
+#~ "\n"
+#~ "ΘÎλετε να το Ï€ÏοσπεÏάσετε;"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Δεν ήταν δυνατή η λήψη της κατάστασης του αÏχείου \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "ΘÎλετε να αντικατασταθεί;"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Η δημιουÏγία του καταλόγου \"%s\" απÎτυχε: %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "ΔιαγÏαφή καταλόγων..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Δεν ήταν δυνατή η διαγÏαφή του καταλόγου \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Δεν είναι δυνατή η μεταφοÏά του ÏÎ¹Î¶Î¹ÎºÎ¿Ï (root) καταλόγου"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Δεν υποστηÏίζονται διασωληνώσεις"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Η ενÎÏγεια ακυÏώθηκε"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Η ανάγνωση του ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï Î´ÎµÏƒÎ¼Î¿Ï \"%s\" απÎτυχε"
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Η αλλαγή της κατάστασης του \"%s\" απÎτυχε"
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "H αντιγÏαφή του ÎµÎ¹Î´Î¹ÎºÎ¿Ï Î±Ïχείου \"%s\" ήταν αδÏνατη"
diff --git a/po/eo.po b/po/eo.po
index d97d9a567708731e053cfc4c9c791d2d9848fb98..db93b26f853cda56be2fb7937bd93e3c38111694 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-07-20 22:42+0200\n"
"Last-Translator: Antono Vasiljev <antono.vasiljev@gmail.com>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -17,375 +17,331 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Kolektante dosierojn..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Ĉu vi volas trapasi tion?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Ne eblas determini dosier-informon pri \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Ne eblas ÅanÄi la permesojn de \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Ne eblas ÅanÄi la posedanton de \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Ne eblas ÅanÄi la grupon de \"%s\": %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr ""
-"La dosiero \"%s\" jam ekzistas. Ĉu vi volas anstataÅigi Äin per malplena "
-"dosiero?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Ne eblas forviÅi \"%s\".\n"
-"\n"
-"Ĉu vi volas lasi tion?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Ne eblas krei malplenan dosieron \"%s\".\n"
-"\n"
-"Ĉu vi volas lasi tion?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Ne eblas legi la enhavon de la dosierujo"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Nekonata eraro"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Ne estas difinita varialo Exec en .desktop dosiero"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "URL variablo ne estas difinita en .desktop dosiero"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Nevalida .desktop dosiero"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Ne sukcesis kompreni la dosieron"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Nevalida dosier-nomo"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Ne sukcesis lanĉi dosieron \"%s\": %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Ĉu vi volas reskribi Äin?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Ne sukcesis forviÅi \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Ne sukcesis lanĉi aplikaĵon el dosiero %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Komando"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "La komando por lanĉi mime traktilon"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Flagoj"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "La flagoj por mime traktilo"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Piktogramo"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Elektu renomendajn dosierojn"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "La piktogramo de la mime traktilo"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Preparadas..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nomo"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Ne eblas ÅanÄi la permesojn de \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "La nomo de la mime traktilo"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Ne eblas ÅanÄi la posedanton de \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "%s dokumento"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Ne eblas ÅanÄi la grupon de \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Ne sukcesis krei dosierujon \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Vojo estas tro longa kaj ne taÅgas por bufro"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI estas tro longa kaj ne taÅgas por bufro"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Amplekso"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Preferata dimensio de bildeto"
+msgid "The file \"%s\" already exists"
+msgstr "La dosiero \"%s\" jam ekzistas"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "ForviÅadas dosierujojn..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Ne sukcesis krei nomitan fifo \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Ne sukcesis forviÅi dosierujon \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Ne povas movi dosierujon de root (radiko)"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Preparadas..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Ne sukcesis malfermi \"%s\" por legado"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Nevalida vojo"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Ne sukcesis malfermi \"%s\" por skribado"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Nekonata uzanto \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "Ne sukcesis skribi datumojn al \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Ne sukcesis difini la munt-punkto por %s"
+msgid "Failed to remove \"%s\""
+msgstr "Ne sukcesis forviÅi \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Ne sukcesis konektiÄi al la HAL dajmono: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Ne sukcesis legi datumojn el \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "kopio de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "alligi al %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "alia kopio de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "alia ligilo al %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "tria kopio de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "tria ligilo al %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%ua kopio de %s"
msgstr[1] "%uaj kopioj de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%ua ligilo al %s"
msgstr[1] "%uaj ligiloj al %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Ne sukcesis defini dosier-informon por \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Ne sukcesis krei dosierujon \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Ne sukcesis krei nomitan fifo \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Nomitaj pipoj ne estas subtenataj"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Ne sukcesis malfermi \"%s\" por legado"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Ne sukcesis krei simbolan ligilon \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "La dosiero \"%s\" jam ekzistas"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Ne sukcesis malfermi \"%s\" por skribado"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Simbolaj ligiloj ne estas subtenataj"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Ne sukcesis legi datumojn el \"%s\""
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Dosier-sistemo"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Ne eblas renomigu \"%s\" al \"%s\"."
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Ne eblas renomigu \"%s\" al \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Ne eblas renomigu \"%s\" al \"%s\"."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "La vojo \"%s\" ne ligas al dosierujo"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Ne sukcesis skribi datumojn al \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "Ne sukcesis lanĉi aplikaĵon el dosiero %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Ne sukcesis forviÅi \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "Ne sukcesis forviÅi \"%s\": %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Operacio nuligita"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Komando"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Ne sukcesis legi celon de la ligilo el \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "La komando por lanĉi mime traktilon"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Flagoj"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "La flagoj por mime traktilo"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Piktogramo"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "La piktogramo de la mime traktilo"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nomo"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "La nomo de la mime traktilo"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Ne sukcesis krei simbolan ligilon \"%s\""
+msgid "%s document"
+msgstr "%s dokumento"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Ne eblas ÅanÄi la reÄimon de \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Simbolaj ligiloj ne estas subtenataj"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Vojo estas tro longa kaj ne taÅgas por bufro"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI estas tro longa kaj ne taÅgas por bufro"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Amplekso"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Preferata dimensio de bildeto"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Kolektante dosierojn..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Nevalida vojo"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Ne sukcesis defini dosier-informon por \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "Nekonata uzanto \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "Ne sukcesis difini la munt-punkto por %s"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Ne sukcesis kopii specialan dosieron \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Ne sukcesis konektiÄi al la HAL dajmono: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -502,58 +458,144 @@ msgid "Sort items in descending order"
msgstr "Malpligrandade ordigu la umojn"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Ne sukcesis lanĉi operacion"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Ne sukcesis malfermi \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Ne sukcesis malfermi \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Kopias dosierojn..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Kreas simbolajn ligilojn..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Movas dosierojn..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Movas dosierojn..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Ĉu vi certas, ke vi volas\n"
+"por ĉiam forviÅi \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Se vi forviÅos dosieron, Äi malaperos por ĉiam."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "ForviÅas dosierojn..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Kreas dosierojn..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Kreas dosierujojn..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "_Malplena dosiero"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Ne sukcesis difini la munt-punkto por %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Kreu novan dosierujon en \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Kreu _Dosierujon..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Ne sukcesis forviÅi \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "ForviÅas dosierojn..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Ne sukcesis difini oportunan aplikaĵon por \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Ne estas selektita aplikaĵo"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -562,20 +604,20 @@ msgstr ""
"\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Alian Aplikaĵon..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Malfermu Per"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Uzu _difinitan komandon:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -584,40 +626,39 @@ msgstr ""
"listo."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Montru..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Uzu kiel _kutiman por ĉi tiu datum-tipo"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Ne sukcesis aldoni novan aplikaĵon \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Ne sukcesis lanĉi \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "_ForviÅu lanĉilon"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Lanĉu <i>%s</i> kaj aliaj dosieroj de ĉi tiu datumtipo (%s) per:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -625,8 +666,7 @@ msgstr ""
"Rigardu la dosier-sistemon por elekti aplikaĵon, kiu estos uzata por "
"malfermi dosierojn de tipo \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -635,12 +675,12 @@ msgstr ""
"ÅœanÄu la aplikaĵon per kiu estos lanĉotaj dosieroj de tipo \"%s\" je "
"selektita aplikaĵo."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Ĉu vi estas certa, ke vi volas forviÅi \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -654,39 +694,39 @@ msgstr ""
"Vi povas forviÅi nur lanĉilon de aplikaĵo, kiu estis kreita per \"Malfermu "
"per\" dialogo de la dosier-administrilo."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Selektu aplikaĵon"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Ĉiuj dosieroj"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Lanĉeblaj dosieroj"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perl skriptoj"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Python skriptoj"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Ruby skriptoj"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shell skriptoj"
@@ -706,7 +746,7 @@ msgid "Other Applications"
msgstr "Aliaj programoj"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr ""
@@ -768,14 +808,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr ""
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Nekonata"
@@ -787,7 +828,7 @@ msgstr "Kompakta listo de dosierujoj"
msgid "Compact view"
msgstr "Kompakta vido"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Entajpu novan nomon:"
@@ -813,7 +854,7 @@ msgstr "Detala listo de dosierujoj"
msgid "Details view"
msgstr "Montru detalojn"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr ""
"Antono Vasiljev <antono.vasiljev@gmail.com>\n"
@@ -821,10 +862,26 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Ne eblas malfermi krozilon por dokumentaro"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Jes"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Jes por ĉ_iuj"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Ne"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Nuligu"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Kopiu ĉi tien"
@@ -879,7 +936,7 @@ msgstr "Posedanto"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Permesoj"
@@ -895,14 +952,10 @@ msgstr "Dosiero"
msgid "File Name"
msgstr "Dosiera Nomo"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "La radika dosierujo ne havas patron"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Dosier-sistemo"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -936,14 +989,14 @@ msgstr "Piktograma vido"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Malfermu"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Malfermu en Nova Fenestro"
@@ -1077,12 +1130,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "rompita ligilo"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1090,112 +1143,131 @@ msgstr[0] ""
msgstr[1] ""
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" rompita ligilo"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) ligilo al %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Amplekso de bildo:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Interspaco"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr ""
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Malfermu \"%s\" en ĉi tiu fenestro"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Malfermu \"%s\" en nova fenestro"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Kreu novan dosierujon en \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Kreu _Dosierujon..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
msgstr ""
-"Movu aÅ kopiu dosierojn kiuj estis frue elektitaj per komandoj Kopiu aÅ Eltondu al \"%s\""
+"Movu aÅ kopiu dosierojn kiuj estis frue elektitaj per komandoj Kopiu aÅ "
+"Eltondu al \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "EnÅovu En Dosierujon"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Montru la propraĵojn de la dosierujo \"%s\""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Propraĵoj"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Nova Dosierujo"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Kreu Novan Dosierujon"
@@ -1212,11 +1284,11 @@ msgstr "_Lokvojo:"
msgid "Failed to launch \"%s\""
msgstr "Ne elblas lanĉi \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Dimensioj de piktogramo"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Dimensioj de piktogramo por voj-enskribo"
@@ -1294,27 +1366,25 @@ msgid "Stop applying permissions recursively."
msgstr ""
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Demando"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Ne demandu min plue"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1322,114 +1392,94 @@ msgid ""
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Ne eblas ÅanÄi grupon de dosiero"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Ne eblas apliki novajn permesojn"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Nekonata posedanto de dosiero"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
"folder afterwards."
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Jes"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Jes por ĉ_iuj"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Ne"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Nuligu"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Agordoj de la dosier-administrilo"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Vidoj"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Montru _novajn dosierujojn per:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Piktograma Vido"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Detala Lista Vido"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Kompakta Lista Vido"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Lasta Aktiva Vido"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Ordigu _dosierujojn antaÅ dosieroj"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "_Montru bildetojn"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Teksto apud piktogramo"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1438,76 +1488,76 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Flanka Panelo"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Panelo de Ligiloj"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "Amplekso de P_iktogramo:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Etega"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Pli eta"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Eta"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normala"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Granda"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Pli granda"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Tre Granda"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Montru Piktogramajn _Emblemojn"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Arba Panelo"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Amplek_so de Piktogramo:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Montru Piktogramajn _Emblemojn"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1516,22 +1566,25 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Konduto"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "_Unuopa kako por aktivigi umojn"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1540,34 +1593,34 @@ msgid ""
"to select the item without activating it."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Malebligita"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Meza"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Longa"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Dufoje klaku por aktivigi umojn"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Dosierujaj Permesecoj"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1577,181 +1630,186 @@ msgstr ""
"apkiki ÅanÄojn ankaÅ al enhavo de la dosierujo. \n"
"Elektu sendemandan konduton sube:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Ĉiam Demandu"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Apliku nur al la Dosierujo"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Apliku al la Dosierujo kaj Äia Enhavo"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Ĝeneralaĵoj"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Nomo:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Kvalito:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Malfermu per:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Celo de la Ligilo:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_ForviÅu"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Modifita:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Atingita:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Amplekso:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Volumo:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Libera Spaco:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Emblemoj"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - ecoj"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Ne eblas renomi \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Dosiero"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "_Sendu Al"
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Kunteksta Dosier-Menuo"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Aldonu dosierojn..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Aldonu dosierojn al la dosier-listo de renomendaj dosieroj"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Purigu"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Purigu la suban dosier-liston"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Pri"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Montru informaĵon pri Thunar-a Amas-renomilo"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Ecoj..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Vidu la ecojn de la elektita dosiero"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Renomigu Multajn Dosierojn"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Renomigu Dosierojn"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
-msgstr ""
-"Klaku ĉi tien por renomi la suprajn dosierojn."
+msgstr "Klaku ĉi tien por renomi la suprajn dosierojn."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Nova nomo"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
-msgstr "Klaku ĉi tien por ekvidi la dokumentaron por eletista renomad-operacio."
+msgstr ""
+"Klaku ĉi tien por ekvidi la dokumentaron por eletista renomad-operacio."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1759,31 +1817,31 @@ msgid ""
msgstr ""
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Elektu renomendajn dosierojn"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "AÅdeblaj Dosieroj"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Bildo-dosieroj"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
#, fuzzy
msgid "Video Files"
msgstr "Plurmediaj Dosieroj"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Amasa Renomilo"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1791,20 +1849,20 @@ msgstr ""
"Amasa Renomilo de Thunar estas potenca kaj dilatebla\n"
"ilo por unuage renomi multajn dosierojn."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "ForviÅu dosieron"
msgstr[1] "ForviÅu dosierojn"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "ForviÅu la elektitan dosieron el la listo de renomendaj dosieroj"
msgstr[1] "ForviÅu la elektitajn dosierojn el la listo de renomendaj dosieroj"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Amasa Renomilo - Renomigu Multajn Dosierojn"
@@ -1847,271 +1905,263 @@ msgstr[0] ""
msgstr[1] ""
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Muntu volumon"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "E_lÅovu volumon"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "Dem_untu volumon"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_ForviÅu la Rapidligilon"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Re_nomigu la rapidigilon"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "La vojo \"%s\" ne ligas al dosierujo"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Ne eblas aldoni novan rapidligilon"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Ne eblas elÅovi \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Ne eblas munti \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Ne eblas demunti \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Klaku ĉi tien por haltigi la kalkuladon de la dosieruja tutamplekso."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Kalkulado stopita"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Kalkulante..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s Bitokoj"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Kunteksta Dosier-Menuo"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Kreu malplenan dosierujon en ĉi tiu dosierujo"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "_Eltondu"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Kopiu"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "_Insertu"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
-msgstr "Movu aÅ kopiu dosierojn kiuj estis selektitaj per komandoj Eltondu aÅ Kopiu"
+msgstr ""
+"Movu aÅ kopiu dosierojn kiuj estis selektitaj per komandoj Eltondu aÅ Kopiu"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_ForviÅu"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
msgstr ""
-"Movu aÅ kopiu dosierojn kiuj estis frue selektitaj per komandoj Eltondu aÅ Kopiu "
-"al selektita dosierujo"
+"Movu aÅ kopiu dosierojn kiuj estis frue selektitaj per komandoj Eltondu aÅ "
+"Kopiu al selektita dosierujo"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Selektu ĉ_iujn dosierojn"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Selektu ĉiujn dosierojn en ĉi tiu fenestro"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Selektu _laÅ Åablono"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Selektu ĉiujn dosierojn kiuj kongruas kun Åablono"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Duo_bligu"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "K_reu ligilon"
msgstr[1] "K_reu ligilojn"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Renomigu..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Renomigu la elektitan dosieron"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Kreu _dokumenton"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "ÅœarÄas enhavon de dosierujo..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Nova malplena dosiero"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Nova malplena dosiero..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Kreu dokumenton el Åablono \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Ĉu vi certas, ke vi volas\n"
-"por ĉiam forviÅi \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Se vi forviÅos dosieron, Äi malaperos por ĉiam."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Selektu laÅ Åablono"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Selektu"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "Ŝ_ablono:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Renomigu \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "Ne valida dosiernomo donita de XDS "
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Ne sukceis krei ligilon por la URL \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Ne sukcesis malfermi dosierujon \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] ""
-msgstr[1] ""
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Lanĉu la elektitan dosieron"
+msgstr[1] "Lanĉu la elektitajn dosierojn"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] ""
msgstr[1] ""
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Renomigu la elektitan dosieron"
+msgstr[1] "Renomigu la elektitan dosieron"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Renomigu la elektitan dosieron"
+msgstr[1] "Renomigu la elektitan dosieron"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Kreu"
@@ -2130,20 +2180,30 @@ msgstr "Mankas instalistaj Åablonoj"
msgid "_Empty File"
msgstr "_Malplena dosiero"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Åœargante..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "_Insertu dosierujen"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "P_ropraĵoj..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Malfermu Novan _Fenestron"
@@ -2557,23 +2617,23 @@ msgid "Shutter Speed:"
msgstr ""
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Softvaro:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Bildo"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Tipo de bildo:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Amplekso de bildo:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2743,39 +2803,39 @@ msgstr ""
msgid "Search & Replace"
msgstr "Serĉu kaj anstataÅigu"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "Ĉu sendi \"%s\"n kiel kompresita arkivo?"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "Sen_du rekte"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "Sendu kom_presitan"
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "Sendu kiel _arkivo"
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2785,28 +2845,28 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "Kompresas dosierojn..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "Komando ZIP haltiÄis kun eraro %d"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr "Ne sukcesis krei tempan dosierujon"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Ne sukcesis krei simbolan ligilon por \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2814,7 +2874,7 @@ msgstr[0] "Ne sukcesis kompresi dosieron %d"
msgstr[1] "Ne sukcesis kompresi dosierojn %d"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "Ne sukcesis krei novan retpoÅt-mesaÄon"
@@ -2822,6 +2882,33 @@ msgstr "Ne sukcesis krei novan retpoÅt-mesaÄon"
msgid "Mail Recipient"
msgstr "Ret-poÅt adresato"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Ne sukcesis konektiÄi al la HAL dajmono: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Definitaj agoj"
@@ -3051,11 +3138,11 @@ msgstr "Traktilo de fina elemento aperis en root-a kunteksto"
msgid "Unknown closing element <%s>"
msgstr "Nekonata malfermiga elemento <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Ne eblas difini sav-vojon por uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Komando ne estas definita"
@@ -3104,3 +3191,83 @@ msgstr "Malfermu dosierujon per Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Malfermu definitajn dosierujojn per Thunar"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Ne eblas ÅanÄi la permesojn de \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Ĉu vi volas trapasi tion?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Ne eblas determini dosier-informon pri \"%s\": %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "La dosiero \"%s\" jam ekzistas. Ĉu vi volas anstataÅigi Äin per malplena "
+#~ "dosiero?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Ne eblas forviÅi \"%s\".\n"
+#~ "\n"
+#~ "Ĉu vi volas lasi tion?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Ne eblas krei malplenan dosieron \"%s\".\n"
+#~ "\n"
+#~ "Ĉu vi volas lasi tion?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Ne sukcesis lanĉi dosieron \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Ĉu vi volas reskribi Äin?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Ne sukcesis krei dosierujon \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "ForviÅadas dosierujojn..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Ne sukcesis forviÅi dosierujon \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Ne povas movi dosierujon de root (radiko)"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Nomitaj pipoj ne estas subtenataj"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Operacio nuligita"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Ne sukcesis legi celon de la ligilo el \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Ne eblas ÅanÄi la reÄimon de \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Ne sukcesis kopii specialan dosieron \"%s\""
diff --git a/po/es.po b/po/es.po
index f8ad97171d22703e393bee7a2b05ed9d8eb06c95..65507132f11d5a0ec6534e549aa854a84ce12275 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-05-04 14:12+0000\n"
"Last-Translator: Daniel Fuertes Pérez (DaniFP) <danifp25@yahoo.es>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -18,373 +18,331 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Reuniendo ficheros..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"¿Desea saltarse este paso?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "No se pudo determinar la información del archivo \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "No se pudieron cambiar los permisos de \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "No se pudo cambiar el propietario del archivo \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "No se pudo cambiar el grupo del archivo \"%s\": %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "El archivo \"%s\" existe. ¿Desea reemplazarlo por un archivo vacÃo?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"No se pudo eliminar \"%s\".\n"
-"\n"
-"¿Quiere dejarlo como está?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"No se pudo crear el archivo vacÃo \"%s\".\n"
-"\n"
-"¿Quiere saltarse este paso?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "No se pudo leer el contenido del directorio"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Error desconocido"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Campo Exec no especificado"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Campo URL no especificado"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Archivo desktop no válido"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "No se pudo analizar el archivo"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "El nombre del archivo no es válido"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "No se pudo ejecutar 'stat' sobre el archivo \"%s\": %s."
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"¿Desea sobreescribirlo?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "No se pudo eliminar \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "No se pudo cargar la aplicación desde el archivo %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Orden"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "La orden para ejecutar el manejador mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Indicadores"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Los indicadores para el manejador mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Icono"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Selecccione archivos a renombrar"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "El icono del manejador mime"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Preparando..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nombre"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "No se pudieron cambiar los permisos de \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "El nombre del manejador mime"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "No se pudo cambiar el propietario del archivo \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "documento %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "No se pudo cambiar el grupo del archivo \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "No se pudo crear el directorio \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "La ruta es tan grande que no cabe en el buffer"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI es demasiado grande para caber en el buffer"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Tamaño"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "El tamaño deseado para la miniatura"
+msgid "The file \"%s\" already exists"
+msgstr "El archivo \"%s\" ya existe"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Eliminando directorios..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "No se pudo crear la tuberia (fifo) con nombre \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "No se pud eliminar el directorio \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "No se puede transferir el directorio raÃz"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Preparando..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "No se pudo abrir \"%s\" para lectura"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Ruta no válida"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "No se pudo abrir \"%s\" para escritura"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Usuario \"%s\" desconocido"
+msgid "Failed to write data to \"%s\""
+msgstr "No se pudieron escribir los datos en \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "No se pudo determinar el punto de montaje para %s"
+msgid "Failed to remove \"%s\""
+msgstr "No se pudo eliminar \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "No se pudo conectar con el demonio HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "No se pudieron leer datos de \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "copia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "enlace a %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "otra copia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "otro enlace a %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "tercera copia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "tercer enlace a %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%uª copia de %s"
msgstr[1] "%uª copias de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "enlace %uº a %s"
msgstr[1] "enlace %uº a %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "No se pudo determinar la información de archivo para \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "No se pudo crear el directorio \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "No se pudo crear la tuberia (fifo) con nombre \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "No se soportan las tuberÃas con nombre"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "No se pudo abrir \"%s\" para lectura"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "No se pudo crear el enlace simbólico \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "El archivo \"%s\" ya existe"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "No se pudo abrir \"%s\" para escritura"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "No se soportan los enlaces simbólicos"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "No se pudieron leer datos de \"%s\""
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Sistema de Ficheros"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "No se pudo renombrar \"%s\" a \"%s\"."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "No se pudo renombrar \"%s\" a \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "No se pudo renombrar \"%s\" a \"%s\"."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "La ruta \"%s\" no apunta a ningún directorio"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "No se pudieron escribir los datos en \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "No se pudo cargar la aplicación desde el archivo %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "No se pudo eliminar \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "No se pudo eliminar \"%s\": %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Operación cancelada"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Orden"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "No se pudo leer el enlace desde \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "La orden para ejecutar el manejador mime"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Indicadores"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Los indicadores para el manejador mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Icono"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "El icono del manejador mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nombre"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "El nombre del manejador mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "No se pudo crear el enlace simbólico \"%s\""
+msgid "%s document"
+msgstr "documento %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "No se pudo cambiar el modo de \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "No se soportan los enlaces simbólicos"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "La ruta es tan grande que no cabe en el buffer"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI es demasiado grande para caber en el buffer"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Tamaño"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "El tamaño deseado para la miniatura"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Reuniendo ficheros..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Ruta no válida"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "No se pudo determinar la información de archivo para \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "Usuario \"%s\" desconocido"
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "No se pudo determinar el punto de montaje para %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "No se pudo copiar el archivo especial \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "No se pudo conectar con el demonio HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -501,58 +459,148 @@ msgid "Sort items in descending order"
msgstr "Ordenar elementos por orden decreciente"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "No se pudo ejecutar la operación"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "No se pudo abrir \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "No se pudo abrir \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Copiando archivos..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Creando enlaces simbólicos..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Moviendo archivos..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Moviendo archivos..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"¿Esta seguro de que desea borrar\n"
+"permanentemente \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"¿Esta seguro de que desea borrar permanentemente\n"
+"el archivo seleccionado?"
+msgstr[1] ""
+"¿Esta seguro de que desea borrar permanentemente\n"
+"los %u archivos seleccionados?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Si borra un archivo, será de forma permanente."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Borrando archivos..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Creando archivos..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Creando directorios..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Fich_ero VacÃo"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "No se pudo determinar el punto de montaje para %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Crear un nuevo directorio en \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Crear _Directorio..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "No se pudo eliminar \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Borrando archivos..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "No se pudo establecer la aplicación predeterminada para \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "No ha seleccionado una aplicación"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -561,20 +609,20 @@ msgstr ""
"del tipo \"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Otra Aplicación..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Abrir Con"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Uar una orden _personalizada:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -583,41 +631,40 @@ msgstr ""
"disponible dentro de la siguiente lista."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Buscar..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Usar como orden por _defecto para este tipo de archivo"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "No se pudo añadir la nueva aplicación \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "No se pudo ejecutar \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
#, fuzzy
msgid "_Remove Launcher"
msgstr "_Borrar marcador"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Abrir <i>%s</i> y otros archivos del tipo \"%s\" con:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -625,8 +672,7 @@ msgstr ""
"Explorar el sistema de archivos para seleccionar una aplicación que abra "
"archivos del tipo \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -635,12 +681,12 @@ msgstr ""
"Cambiar la aplicación por defecto para archivos del tipo \"%s\" a la "
"aplicación elegida."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, fuzzy, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "¿Esta seguro de que desea borrar todos los elementos de la papelera?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -649,39 +695,39 @@ msgid ""
"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Seleccionar una Aplicación"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Todos los Archivos"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Archivos Ejecutables"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Scripts de Perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Scripts en Python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Scripts en Ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Scripts de Shell"
@@ -701,7 +747,7 @@ msgid "Other Applications"
msgstr "Otras Aplicaciones"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "No hay nada en el portapapeles que pueda ser pegado"
@@ -769,14 +815,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "_Expandir automáticamente las columnas según se requiera"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Desconocido"
@@ -788,7 +835,7 @@ msgstr "Listado de directorio compacto"
msgid "Compact view"
msgstr "Vista compacta"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Introduzca el nuevo nombre:"
@@ -815,16 +862,32 @@ msgstr "Listado detallado del directorio"
msgid "Details view"
msgstr "Vista detallada"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "Daniel Fuertes Pérez <danifp25@yahoo.es>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "No se pudo abrir el visor de documentación"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_SÃ"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Si _a todo"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_No"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Cancelar"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Copiar aquÃ"
@@ -879,7 +942,7 @@ msgstr "Propietario"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Permisos"
@@ -895,14 +958,10 @@ msgstr "Fichero"
msgid "File Name"
msgstr "Nombre de Archivo"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "El directorio raÃz no tiene padre"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Sistema de Ficheros"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -938,14 +997,14 @@ msgstr "Vista de iconos"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Abrir"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Abrir en una Ventana Nueva"
@@ -1081,12 +1140,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Abrir los archivos seleccionados"
msgstr[1] "Abrir los archivos seleccionados"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "enlace roto"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1094,83 +1153,101 @@ msgstr[0] "%d elemento (%s), espacio libre %s"
msgstr[1] "%d elementos (%s), espacio libre %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d elemento, Espacio libre %s"
msgstr[1] "%d elementos, Espacio libre %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d elemento"
msgstr[1] "%d elementos"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" enlace roto"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) enlace a %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Tamaño de Imagen:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d elemento seleccionado (%s)"
msgstr[1] "%d elementos seleccionados (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d elemento seleccionado"
msgstr[1] "%d elementos seleccionados"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Espaciado"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Espacio entre los botones de dirección"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Abrir \"%s\" en esta ventana"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Abrir \"%s\" en una nueva ventana"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Crear un nuevo directorio en \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Crear _Directorio..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1178,29 +1255,29 @@ msgstr ""
"Copia o mueve archivos (seleccionados previamente mediante la orden de "
"Copiar o Cortar) a \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Pegar Dentro del Directorio"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Ver las propiedades del directorio \"%s\""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Propiedades"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Nuevo Directorio"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Crear Nuevo Directorio"
@@ -1217,11 +1294,11 @@ msgstr "_Ubicación:"
msgid "Failed to launch \"%s\""
msgstr "No se pudo ejecutar \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Tamaño de Icono"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Tamaño del icono de la entrada de dirección"
@@ -1303,17 +1380,15 @@ msgid "Stop applying permissions recursively."
msgstr "Detener aplicación de permisos recursÃvamente."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Pregunta"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "¿Aplicar recursÃvamente?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1322,11 +1397,11 @@ msgstr ""
"¿Quiere aplicar los cambios recursÃvamente a todos los \n"
"archivos y directorios contenidos en el directorio seleccionado?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_No me lo preguntes de nuevo"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1337,29 +1412,29 @@ msgstr ""
"cambiar su decisión."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "No se pudo cambiar el grupo"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "No se pudieron aplicar los nuevos permisos"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Propietario (del archivo) desconocido"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "¿Corregir automáticamente los permisos del directorio?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Corregir los permisos del directorio"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1368,77 +1443,57 @@ msgstr ""
"Los permisos del directorio se reiniciarán a un estado consistente. Sólo los "
"usuarios que puedan leer el contenido del directorio podrán entrar en él."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_SÃ"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Si _a todo"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_No"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Preferencias del Administrador de Archivos"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "_Vistas"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Vista Predeterminada"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Ver las _nuevas carpetas mediante:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Vista de Iconos"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Vista de lista detallada"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Vista de Lista Compacta"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Última Vista Activa"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Ordenar los directorios antes que los _ficheros"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Escoge esta opción para que al ordenar un directorio, aparezcan los "
"subdirectorios antes que los ficheros."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Mo_strar miniaturas"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1446,11 +1501,11 @@ msgstr ""
"Seleccione esta opción para mostrar una previsualización en miniatura de los "
"archivos dentro del directorio."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Texto al lado de los iconos"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1461,58 +1516,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Panel Lateral"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Panel de Accesos Directos"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "Tamaño de _Icono"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Muy Pequeño"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Más Pequeño"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Pequeño"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normal"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Grande"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Más Grande"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Muy Grande"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Mostrar los _Emblemas de los Iconos"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1521,19 +1576,19 @@ msgstr ""
"de accesos directos para todos los directorios para los que se hayan "
"definido emblemas en el diálogo de propiedades del directorio."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Panel arborescente"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Tamaño de _Icono"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "_Mostrar Emblemas de los Iconos"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1545,16 +1600,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Comportamiento"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "Una _sola pulsación para activar los elementos"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1562,7 +1620,7 @@ msgstr ""
"Especifique el retar_do antes de que el elemento sea seleccionado\n"
"cuando el puntero del ratón se situe sobre él:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1571,34 +1629,34 @@ msgid ""
"to select the item without activating it."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Desactivado"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Medio"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Largo"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Doble pulsación para activar los elementos"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Avanzado"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Permisos del Directorio"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1608,175 +1666,180 @@ msgstr ""
"aplicar los cambios a lo que haya dentro. Seleccione \n"
"debajo el comportamiento predeterminado:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Preguntar Siempre"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Aplicar Sólo al Directorio"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Aplicar al Directorio y a su Contenido"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(falta %lu hour)"
msgstr[1] "(faltan %lu hours)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(falta %lu minuto)"
msgstr[1] "(faltan %lu minutos)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(falta %lu segundo)"
msgstr[1] "(faltan %lu segundos)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "General"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Nombre:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Tipo:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Abrir Con:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Destino del Enlace:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Eliminar"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Modificado:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Accedido:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Tamaño:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Volumen:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Espacio Libre:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Emblemas"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Propiedades"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "No se pudo renombrar \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Fichero"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Menú Contextual de Archivo"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Añadir Ficheros..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Incluir archivos adicionales en la lista de archivos a renombrar"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Limpiar"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Limpiar la lista inferior"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Acerca de"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Muestra información acerca del Renombrador Masivo de Thunar"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Propiedades..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Ver las propiedades del fichero seleccionado"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Renombrar Múltiples Ficheros"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Renombrar Ficheros"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
"Pulse aquà para renombrar realmente los archivos listados arriba a sus "
"nuevos nombres."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Nuevo Nombre"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
"Pulse aquà para ver la documentación para la operación de renombrado "
@@ -1785,7 +1848,7 @@ msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1797,30 +1860,30 @@ msgstr ""
"Renamers\"."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Selecccione archivos a renombrar"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Ficheros de Sonido"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Ficheros de Imagen"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Ficheros de VÃdeo"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Renombrador Masivo"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1828,13 +1891,13 @@ msgstr ""
"El Renombrador Masivo de Thunar es una herramienta potente \n"
"y extensible para renombrar múltiples archivos de una vez."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Eliminar Fichero"
msgstr[1] "Eliminar Ficheros"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Elimina el archivo seleccionado de la lista de archivos a renombrar"
@@ -1842,7 +1905,7 @@ msgstr[1] ""
"Elimina los archivos seleccionados de la lista de archivos a renombrar"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Renombrador Masivo - Renombra Múltiples Ficheros"
@@ -1893,120 +1956,120 @@ msgstr[1] ""
"Añadir los directorios seleccionados al panel lateral de accesos directos"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Montar Volumen"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "E_xtraer Volumen"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_Desmontar Volumen"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "Elimina_r Acceso Directo"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Re_nombrar Acceso Directo"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "La ruta \"%s\" no apunta a ningún directorio"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "No se pudo añadir un nuevo acceso directo"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "No se pudo extraer \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "No se pudo montar \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "No se pudo desmontar \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Pulse aquà para detener el cálculo del tamaño total del directorio."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Cálculo interrumpido"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Calculando..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s Bytes"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u elemento, totalizando %s"
msgstr[1] "%u elementos, totalizando %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Menú Contextual del Directorio"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Crear subdirectorio vacÃo dentro del directorio actual"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "Cor_tar"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Copiar"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "_Pegar"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Mover o copiar archivos seleccionados anteriormente con la orden de Cortar o "
"Copiar"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Eliminar"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2014,127 +2077,99 @@ msgstr ""
"Mover o copiar archivos (seleccionados anteriormente con la orden de Cortar "
"o Copiar) en el directorio seleccionado"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Seleccion_ar todos los Ficheros"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Seleccionar todos los ficheros de esta ventana"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Seleccionar _usando Patrón..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Selecciona todos los archivos que coinciden con un patrón dado"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Du_plicar"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Crear un En_lace"
msgstr[1] "Crear En_laces"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Renombrar..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Renombrar el fichero seleccionado"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Crear _Documento"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Cargando el contenido del directorio..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Nuevo Fichero VacÃo"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Nuevo Fichero VacÃo..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Crear Documento mediante la plantilla \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"¿Esta seguro de que desea borrar\n"
-"permanentemente \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"¿Esta seguro de que desea borrar permanentemente\n"
-"el archivo seleccionado?"
-msgstr[1] ""
-"¿Esta seguro de que desea borrar permanentemente\n"
-"los %u archivos seleccionados?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Si borra un archivo, será de forma permanente."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Seleccionar usando Patrón"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Seleccionar"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Patrón:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Renombrar \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "No se pudo crear la tuberia fifo \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, fuzzy, c-format
msgid "Failed to open directory \"%s\""
msgstr "No se pudo abrir el directorio \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] ""
@@ -2142,7 +2177,7 @@ msgstr[0] ""
msgstr[1] ""
"Preparar los ficheros seleccionados para mover mediante una orden de Pegar"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] ""
@@ -2150,24 +2185,39 @@ msgstr[0] ""
msgstr[1] ""
"Preparar el fichero seleccionado para copiar mediante una orden de Pegar"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Eliminar permanentemente el fichero seleccionado"
-msgstr[1] "Eliminar permanentemente los ficheros seleccionados"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Duplicar el fichero seleccionado"
+msgstr[1] "Duplicar cada fichero seleccionado"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Duplicar el fichero seleccionado"
msgstr[1] "Duplicar cada fichero seleccionado"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Crear un enlace simbólico para el archivo seleccionado"
msgstr[1] "Crear un enlace simbólico para cada archivo seleccionado"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Renombrar el fichero seleccionado"
+msgstr[1] "Renombrar el fichero seleccionado"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Renombrar el fichero seleccionado"
+msgstr[1] "Renombrar el fichero seleccionado"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Crear"
@@ -2186,20 +2236,30 @@ msgstr "No se ha instalado ninguna plantilla"
msgid "_Empty File"
msgstr "Fich_ero VacÃo"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Cargando..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "_Pegar en el Directorio"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "P_ropiedades"
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Abrir Nueva _Ventana"
@@ -2629,23 +2689,23 @@ msgid "Shutter Speed:"
msgstr "Velocidad del Obturador:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Software:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Imagen"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Tipo de Imagen:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Tamaño de Imagen:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2826,39 +2886,39 @@ msgstr "Expresión regular no válida, en la posición del carácter %ld: %s"
msgid "Search & Replace"
msgstr "Buscar y Reemplazar"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2868,30 +2928,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "Copiando archivos..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "No se pudo crear el directorio \"%s\""
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "No se pudo crear el enlace simbólico \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2899,7 +2959,7 @@ msgstr[0] "No se pudo abrir el archivo %d"
msgstr[1] "No se pudieron abrir los %d archivos"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "No se pudo abrir el archivo %d"
@@ -2908,6 +2968,33 @@ msgstr "No se pudo abrir el archivo %d"
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "No se pudo conectar con el demonio HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Acciones Personalizadas"
@@ -3146,11 +3233,11 @@ msgstr ""
msgid "Unknown closing element <%s>"
msgstr "Elemento desconocido de cierre <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "No se pudo determinar la ubicación donde se guarda uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Orden no configurada"
@@ -3201,3 +3288,86 @@ msgstr "Abrir Directorio con Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Abrir el directorio especificado en Thunar"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Eliminar permanentemente el fichero seleccionado"
+#~ msgstr[1] "Eliminar permanentemente los ficheros seleccionados"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "No se pudieron cambiar los permisos de \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "¿Desea saltarse este paso?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "No se pudo determinar la información del archivo \"%s\": %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "El archivo \"%s\" existe. ¿Desea reemplazarlo por un archivo vacÃo?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "No se pudo eliminar \"%s\".\n"
+#~ "\n"
+#~ "¿Quiere dejarlo como está?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "No se pudo crear el archivo vacÃo \"%s\".\n"
+#~ "\n"
+#~ "¿Quiere saltarse este paso?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "No se pudo ejecutar 'stat' sobre el archivo \"%s\": %s."
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "¿Desea sobreescribirlo?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "No se pudo crear el directorio \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Eliminando directorios..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "No se pud eliminar el directorio \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "No se puede transferir el directorio raÃz"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "No se soportan las tuberÃas con nombre"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Operación cancelada"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "No se pudo leer el enlace desde \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "No se pudo cambiar el modo de \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "No se pudo copiar el archivo especial \"%s\""
diff --git a/po/et.po b/po/et.po
index 1a69c4abfb8b9a595e9cd446c65030c6c65592d0..342c89b76882a1a4932f69fe798c9296e2426a8b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-04-18 16:37+0300\n"
"Last-Translator: Peeter Vois <Peeter.Vois@proekspert.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -16,375 +16,332 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Kogun faile ..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Kas te soovite seda vahele jätta?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Faili \"%s\" info määramine ebaõnnestus: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Faili \"%s\" õiguste muutmine ebaõnnestus: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Faili \"%s\" omaniku muutmine ebaõnnestus: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Faili \"%s\" grupi muutmine ebaõnnestus: %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Fail \"%s\" on juba olemas. Kas te soovite seda tühjaks teha?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Ei õnnestunud eemaldada \"%s\".\n"
-"\n"
-"Kas te soovite seda vahele jätta?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Ei õnnestunud luua tühja faili \"%s\".\n"
-"\n"
-"Kas te soovite seda vahele jätta?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Kataloogi sisu lugemine läks nässu"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Tundamtu viga"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Käivita väli on puudu"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "URL väli on puudu"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Sobimatu desktop fail"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Faili lugemine ebaõnnestus"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Faili nime viga"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Faili \"%s\" info hankimine läks nässu: %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Kas te soovite seda üle kirjutada?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "\"%s\" eemaldamine läks nässu: %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Rakenduse hankimine failist %s läks nässu"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Käsklus"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "Käsklus miimi käsitleja käivitamiseks"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Lipud"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Miimi käsitleja atribuudid"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Ikoon"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Vali failid ümbernimetamiseks"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "Miimi käsitleja ikoon"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Valmistan ette..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nimi"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Faili \"%s\" õiguste muutmine ebaõnnestus: %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Miimi käsitleja nimi"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Faili \"%s\" omaniku muutmine ebaõnnestus: %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "%s dokument"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Faili \"%s\" grupi muutmine ebaõnnestus: %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Kataloogi \"%s\" loomine läks nässu: %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Teekond on liialt pikk, et mahtuda eraldatud mällu"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI on liialt pikk, et mahtuda eraldatud mällu"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Suurus"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Soovitud pisipildi suurus"
+msgid "The file \"%s\" already exists"
+msgstr "Fail \"%s\" on juba olemas"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Kataloogide kustutamine..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Fifo \"%s\" tegemine läks nässu"
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Kataloogi \"%s\" eemaldamine läks nässu: %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Faili panek juurkataloogi läks nässu"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Valmistan ette..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "\"%s\" lugemiseks avamine läks nässu"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Sobimatu teekond"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "\"%s\" kirjutamiseks avamine läks nässu"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Kasutaja \"%s\" on tundmatu"
+msgid "Failed to write data to \"%s\""
+msgstr "Andmete kirjutamine \"%s\"-i läka nässu"
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "%s-le haake koha määramine läks nässu"
+msgid "Failed to remove \"%s\""
+msgstr "\"%s\"-i eemaldamine läks nässu"
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "HAL deemoni %s külge ühendumine läks nässu"
+msgid "Failed to read data from \"%s\""
+msgstr "\"%s\"-st andmete lugemine läks nässu"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "%s-i koopia"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "viide %s-le"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "veel üks %s-i koopia"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "veel üks link %s-le"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "kolmas %s-i koopia"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "kolmas %s-i viide"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%u koopia %s-ist"
msgstr[1] "%u koopia %s-ist"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%u viide %s-ile"
msgstr[1] "%u viide %s-ile"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Faili \"%s\" info hankimine läks nässu."
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Kataloogi \"%s\" loomine läks nässu"
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Fifo \"%s\" tegemine läks nässu"
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
+#, c-format
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Sümbolviida \"%s\" loomine läks nässu."
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
#, fuzzy
-msgid "Named pipes are not supported"
+msgid "Symbolic links are not supported"
msgstr "Käivita deemoni viisil (pole toetatud)"
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
-#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "\"%s\" lugemiseks avamine läks nässu"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Failisüsteem"
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Fail \"%s\" on juba olemas"
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "\"%s\" ümbernimetamine \"%s\"-ks läks nässu."
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "\"%s\" kirjutamiseks avamine läks nässu"
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "\"%s\"-st andmete lugemine läks nässu"
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "\"%s\" ümbernimetamine \"%s\"-ks läks nässu."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "\"%s\" ümbernimetamine \"%s\"-ks läks nässu."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Teekond \"%s\" ei viita kataloogile"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Andmete kirjutamine \"%s\"-i läka nässu"
+msgid "Failed to load application from file %s"
+msgstr "Rakenduse hankimine failist %s läks nässu"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "\"%s\"-i eemaldamine läks nässu"
+msgid "Failed to remove \"%s\": %s"
+msgstr "\"%s\" eemaldamine läks nässu: %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Tegevus katkestati"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Käsklus"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Viida lugemine \"%s\"-ist läks nässu."
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "Käsklus miimi käsitleja käivitamiseks"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Lipud"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Miimi käsitleja atribuudid"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Ikoon"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "Miimi käsitleja ikoon"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nimi"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Miimi käsitleja nimi"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Sümbolviida \"%s\" loomine läks nässu."
+msgid "%s document"
+msgstr "%s dokument"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "\"%s\"-i oleku muutmine läks nässu."
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-#, fuzzy
-msgid "Symbolic links are not supported"
-msgstr "Käivita deemoni viisil (pole toetatud)"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Teekond on liialt pikk, et mahtuda eraldatud mällu"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI on liialt pikk, et mahtuda eraldatud mällu"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Suurus"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Soovitud pisipildi suurus"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Kogun faile ..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Sobimatu teekond"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Faili \"%s\" info hankimine läks nässu."
+msgid "Unknown user \"%s\""
+msgstr "Kasutaja \"%s\" on tundmatu"
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "%s-le haake koha määramine läks nässu"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Spetsiaalfaili \"%s\" kopeerimine läks nässu."
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "HAL deemoni %s külge ühendumine läks nässu"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -501,58 +458,148 @@ msgid "Sort items in descending order"
msgstr "Sorteeri asjad kahanevas järjekorras"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Operatsiooni käivitamine läks nässu"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "\"%s\"-i avamine läks nässu"
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "\"%s\"-i avamine läks nässu: %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Kopeerin faile..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Loon sümbolviiteid..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Liigutan faile..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Liigutan faile..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Olete te kindel, et te soovite\n"
+"igaveseks hävitada \"%s\"-i ?"
+
+#: ../thunar/thunar-application.c:1078
+#, fuzzy, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Olete te kindel, et te soovite\n"
+"igaveseks hävitada \"%s\"-i ?"
+msgstr[1] ""
+"Olete te kindel, et te soovite\n"
+"igaveseks hävitada \"%s\"-i ?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Kui te hävitate faili, siis see kaob jäädavalt."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Kustutan faile..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Tekitan faile..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Tekitan katalooge..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "_Tühi fail"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "%s-le haake koha määramine läks nässu"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Tekita \"%s\"-s uus kataloog"
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Tekita _Kaust..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "\"%s\"-i eemaldamine läks nässu"
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Kustutan faile..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "\"%s\"-ile tavalise rakenduse määramine läks nässu"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Rakendust pole valitud"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -561,20 +608,20 @@ msgstr ""
"tüübist \"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Muu rakendus..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Ava kasutades"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Kasuta _sellist käsklust:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -582,63 +629,61 @@ msgstr ""
"Kasuta spetskäsku rakendusele, mis ei ole ülalmainitud rakenduste hulgas."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Sirvi..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Kasuta kui _esialgne selle faili tüübi jaoks"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Uue rakenduse \"%s\" lisamine läks nässu"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "\"%s\"-i käivitamine läks nässu"
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
#, fuzzy
msgid "_Remove Launcher"
msgstr "Startija"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Ava <i>%s</i> ja teised failid tüübist \"%s\" kasutades:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
msgstr ""
"Sirvi failisüsteemi, et valida rakendus, mis avaks faile tüübist \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr "Muuda failide, tüübist \"%s\", vaikimisi rakendus valitud rakenduseks."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, fuzzy, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr ""
"Olete te kindel, et te soovite\n"
"igaveseks hävitada \"%s\"-i ?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -647,39 +692,39 @@ msgid ""
"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Vali rakendus"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Kõik failid"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Käivitatavad failid"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perli skriptid"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Pythoni skriptid"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Ruby skriptid"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shelli skriptid"
@@ -699,7 +744,7 @@ msgid "Other Applications"
msgstr "Muud rakendused"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Kleepeplaadil pole midagi mida asetada"
@@ -766,14 +811,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "Vajadusel suurenda tulpasid automaatselt"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Tundmatu"
@@ -785,7 +831,7 @@ msgstr "Tihe kataloogi nimekiri"
msgid "Compact view"
msgstr "Tihe vaade"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Sisesta uus nimi:"
@@ -811,16 +857,32 @@ msgstr "Kataloogi detailne nimistu"
msgid "Details view"
msgstr "Detailide vaade"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "tõlkijatest kreeditorid"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Dokumentide sirvuri avamine läks nässu"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Jah"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Jah _kõigile"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Ei"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Loobu"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Kopeeri siia"
@@ -875,7 +937,7 @@ msgstr "Omanik"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Õigused"
@@ -891,14 +953,10 @@ msgstr "Fail"
msgid "File Name"
msgstr "Fali nimi"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Juurkataloogil ei ole pealmist kataloogi"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Failisüsteem"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -934,14 +992,14 @@ msgstr "Ikooni vaade"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Ava"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Ava uues aknas"
@@ -1077,12 +1135,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Ava valitud failid"
msgstr[1] "Ava valitud failid"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "katkine viide"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1090,83 +1148,101 @@ msgstr[0] "%d asi, Vaba ruumi %s"
msgstr[1] "%d asju (%s), Vaba ruumi: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d asi, Vaba ruumi %s"
msgstr[1] "%d asja, Vaba ruumi: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d asi"
msgstr[1] "%d asja"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" katkine viide"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) viitab %s-le"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Pildi suurus:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d asi valitud (%s)"
msgstr[1] "%d asja valitud (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d asi valitud"
msgstr[1] "%d asja valitud"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Vahe"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Vahe suurus teekonna nuppude vahel"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Ava \"%s\" selles aknas"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Ava \"%s\" uues aknas"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Tekita \"%s\"-s uus kataloog"
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Tekita _Kaust..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1174,30 +1250,30 @@ msgstr ""
"Tõsta ümber või kopeeri failid, mis eelnevalt on valitud kas lõika või "
"kopeeri käsuga \"%s\" sisse."
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Pane failid kataloogi"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, fuzzy, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Näita valitud faili omadusi"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
#, fuzzy
msgid "_Properties"
msgstr "_Omadused..."
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Uus kataloog"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Tekita uus kataloog"
@@ -1214,11 +1290,11 @@ msgstr "_Asukoht:"
msgid "Failed to launch \"%s\""
msgstr "\"%s\" käivitamine läks nässu"
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Ikooni suurus"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Ikooni suurus teekonna sisestusel"
@@ -1300,17 +1376,15 @@ msgid "Stop applying permissions recursively."
msgstr "Peata õiguste rekursiivne rakendamine."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Küsimus"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Kas rakendada rekursiivselt?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1319,11 +1393,11 @@ msgstr ""
"kas te soovite rakendada muudatused rekursiivselt\n"
"kõigile failidele ja kataloogidele valitud kataloogis?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "Ära _küsi enam"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1333,29 +1407,29 @@ msgstr ""
"enam.Te saate kasutada seadistuste dialoogi vastuse muutmiseks hiljem."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Grupi muutmine läks nässu"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Uute õiguste rakendamine läks nässu"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Tundmatu faili omanik"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Kas parandada kataloogi õigused automaatselt?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Paranda kataloogi õigused"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1365,75 +1439,55 @@ msgstr ""
"lubatakse lugeda selle kataloogi sisu, lubatakse edaspidi siseneda selles "
"kataloogi."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Jah"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Jah _kõigile"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Ei"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Loobu"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Faili halduri seadistused"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Vaated"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Esialgne vaade"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Vaata _uusi katalooge kasutades:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Ikooni vaade"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Detailse nimistu vaade"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Tihe nimistu vaade"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Viimane aktiivne vaade"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Sorteeri katalooge enne _faile"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr "Vali see et näidata katalooge enne faile kui te kataloogi sorteerite."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "_Näita pisipilte"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1441,11 +1495,11 @@ msgstr ""
"Vali see et näidata eelvaadatavaid faile kataloogis kui automaatselt "
"valmistatud pisipilt-ikoone."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Text on ikoonide all"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1455,58 +1509,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Küljepaneel"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Lühiteede paneel"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_Ikooni suurus:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Väga väike"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Väiksem"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Väike"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normaalne"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Suur"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Suurem"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Väga suur"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Näita ikooni _embleeme"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1514,19 +1568,19 @@ msgstr ""
"Vali see, et näidata kõigi failide embleeme lühiteede nimistus, mille "
"jaokson embleemid defineeritud faili seadistuste dialoogis."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Puu paneel"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Ikooni _suurus"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Näita ikooni e_mbleeme"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1537,16 +1591,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Käitumine"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "Ü_ks toks aktiveerib asja"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1554,7 +1611,7 @@ msgstr ""
"Määra _viivitus enne asja valimist\n"
"kui hiir on peatatud asja peale:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1568,34 +1625,34 @@ msgstr ""
"võib olla kasulik, kui üksik toks aktiveerib asju ja te tahate ainult valida "
"asja ilma et seda aktiveerida."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Keelatud"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Keskmine"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Pikk"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Topelt toks et aktiveerida asi"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Edendatud"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Kausta õigused"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1605,180 +1662,185 @@ msgstr ""
"muudatusi ka kataloogi sisule. Valige allpool esialgne\n"
"käitumisviis:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Küsi iga kord"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Rakenda ainult kataloogile"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Rakenda kataloogile ja sisule"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu tundi järel)"
msgstr[1] "(%lu tundi järel)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu minutit järel)"
msgstr[1] "(%lu minutit järel)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(%lu sekundit järel)"
msgstr[1] "(%lu sekundit järel)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Ãœldine"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Nimi:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Laad:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Ava kasutades:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Lingi sihtmärk:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "K_ustuta"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Muudetud:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Kasutatud:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Suurus:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Kogus:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Vaba ruum:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Embleemid"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, fuzzy, c-format
msgid "%s - Properties"
msgstr "_Omadused..."
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "\"%s\" ümbernimetamine läks nässu"
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Fail"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Faili kontekstimenüü"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Lisa failid..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Lisa ümbernimetatavate failide hulka veel faile"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Puhasta"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Puhasta allpoll olev faili nimistu"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Sellest"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Näita Thunari massilise ümbernimetamise kohta teavet"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Omadused..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Näita valitud faili omadusi"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Nimeta palju faile ümber"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Nimeta failid ümber"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "Toksa siia et tegelikult ülal nimetatud failid ümber nimetada uuteks."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Uus nimi"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr "Toksa siia, et näha valitud ümbernimetamise operatsiooni kirjeldust."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1791,30 +1853,30 @@ msgstr ""
"lähtekoodist, siis lubage \"Simple Builtin Renamers\" lisavidin."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Vali failid ümbernimetamiseks"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Helifailid"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Pildi failid"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Videofailid"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Hulganisti ümbernimetus"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1822,20 +1884,20 @@ msgstr ""
"Thunari hulgi ümbernimetamine on võimas ja laiendatav\n"
"abivahend paljude failide korraga ümbernimetamiseks."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Pildi failid"
msgstr[1] "Eemalda failid"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Eemalda valitud fail ümbernimetatavate failide nimekirjast"
msgstr[1] "Eemalda valitud failid ümbernimetatavate failide nimekirjast"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Hulga ümbernimetus - Nimeta palju faile ümber"
@@ -1884,122 +1946,122 @@ msgstr[0] "Lisa valitud kaust lühiteede kõrvalpaanile"
msgstr[1] "Lisa valitud kaustad lühiteede kõrvalpaanile"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Haagi seade"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "_Väljasta seade"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "Haagi _lahti seade"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_Eemalda lühitee"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "_Nimeta lühitee ümber"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Teekond \"%s\" ei viita kataloogile"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Uue lühitee lisamine läks nässu"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "\"%s\" väljastamine läks nässu"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "\"%s\"-i haakimine läks nässu"
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "\"%s\"-i lahtihaakimine läks nässu"
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
#, fuzzy
msgid "Click here to stop calculating the total size of the folder."
msgstr "Toksa siia, et teha kataloogi õigused automaatselt korda."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
#, fuzzy
msgid "Calculation aborted"
msgstr "Arvutamisel ..."
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Arvutamisel ..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s Baiti"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u asi, kokku %s"
msgstr[1] "%u asju, kokku %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Kataloogi kontekstimenüü"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Tekita tühi kaust avatud kausta sisse"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "_Lõika"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Kopeeri"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "_Kleebi"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Tõsta ümber või kopeeri failid, mis eelnevalt on valitud kas lõika või "
"kopeeri käsuga"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "K_ustuta"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2007,156 +2069,143 @@ msgstr ""
"Tõsta ümber või kopeeri failid, mis eelnevalt on valitud kas lõika või "
"kopeeri käsklusega, valitud kataloogi"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Vali _kõik failid"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Vali kõik failid selles kataloogis"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Vali kirjelduse _järgi..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Vali kõik failid, mis klapivad määratud kirjeldusega"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Kl_ooni"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "T_ee viide"
msgstr[1] "T_ee viited"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "Nimeta _ümber"
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Nimeta valitud fail ümber"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Tekita _dokument"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Laen kataloogi sisu..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Uus tühi fail"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Uus tühi fail..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Tekita dokument malli \"%s\" järgi"
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Olete te kindel, et te soovite\n"
-"igaveseks hävitada \"%s\"-i ?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, fuzzy, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Olete te kindel, et te soovite\n"
-"igaveseks hävitada \"%s\"-i ?"
-msgstr[1] ""
-"Olete te kindel, et te soovite\n"
-"igaveseks hävitada \"%s\"-i ?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Kui te hävitate faili, siis see kaob jäädavalt."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Vali kirjelduse järgi"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Vali"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Kirjeldus:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Nimeta \"%s\" ümber"
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, fuzzy, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Fifo \"%s\" tegemine läks nässu"
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Kataloogi \"%s\" avamine läks nässu"
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "Ava valitud fail esmase rakendusega"
msgstr[1] "Märgi valitud failid nihutamiseks kleebi käsuga"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "Märgi valitud fail kopeerimiseks asetamise käsu jaoks"
msgstr[1] "Märgi valitud failid kopeerimiseks asetamise käsu jaoks"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Kustuta valitud failid"
-msgstr[1] "Kustuta kõik valitud failid jäädavalt"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Klooni kõik valitud failid"
+msgstr[1] "Klooni kõik valitud failid"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Klooni kõik valitud failid"
msgstr[1] "Klooni kõik valitud failid"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Tekida sümbolviide kõigile valitud failidele"
msgstr[1] "Tekida sümbolviide kõigile valitud failidele"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Nimeta valitud fail ümber"
+msgstr[1] "Nimeta valitud fail ümber"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Nimeta valitud fail ümber"
+msgstr[1] "Nimeta valitud fail ümber"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Tekita"
@@ -2175,20 +2224,30 @@ msgstr "Malle pole installitud"
msgid "_Empty File"
msgstr "_Tühi fail"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Laadimisel..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "Pane kataloogi"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "_Omadused..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Ava uus _aken"
@@ -2611,23 +2670,23 @@ msgid "Shutter Speed:"
msgstr "Katiku kiirus:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Tarkvara:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Pilt"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Pildi tüüp:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Pildi suurus:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2804,39 +2863,39 @@ msgstr "Sobimatu tavakirjeldus, viga sümboli positsioonil %ld: %s"
msgid "Search & Replace"
msgstr "Otsi ja asenda"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2846,30 +2905,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "Kopeerin faile..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "Kataloogi \"%s\" loomine läks nässu"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Sümbolviida \"%s\" loomine läks nässu."
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2877,7 +2936,7 @@ msgstr[0] "faili %d avamine läks nässu"
msgstr[1] "%d-ne faili avamine läks nässu"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "faili %d avamine läks nässu"
@@ -2886,6 +2945,33 @@ msgstr "faili %d avamine läks nässu"
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "HAL deemoni %s külge ühendumine läks nässu"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Kohandatud tegevused"
@@ -3120,11 +3206,11 @@ msgstr "Elemendi haldaja lõpetamine kutsuti siis kui haldaja oli algkontekstis"
msgid "Unknown closing element <%s>"
msgstr "Tundmatu sulgev element <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Faili \"uca.xml\" salvestamise asukoha leidmine läks nässu"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Käsk ei ole seadistatud"
@@ -3174,3 +3260,87 @@ msgstr "Ava kaust thunaris"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Ava valitud kaustad thunaris"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Kustuta valitud failid"
+#~ msgstr[1] "Kustuta kõik valitud failid jäädavalt"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Faili \"%s\" õiguste muutmine ebaõnnestus: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Kas te soovite seda vahele jätta?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Faili \"%s\" info määramine ebaõnnestus: %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "Fail \"%s\" on juba olemas. Kas te soovite seda tühjaks teha?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Ei õnnestunud eemaldada \"%s\".\n"
+#~ "\n"
+#~ "Kas te soovite seda vahele jätta?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Ei õnnestunud luua tühja faili \"%s\".\n"
+#~ "\n"
+#~ "Kas te soovite seda vahele jätta?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Faili \"%s\" info hankimine läks nässu: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Kas te soovite seda üle kirjutada?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Kataloogi \"%s\" loomine läks nässu: %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Kataloogide kustutamine..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Kataloogi \"%s\" eemaldamine läks nässu: %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Faili panek juurkataloogi läks nässu"
+
+#, fuzzy
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Käivita deemoni viisil (pole toetatud)"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Tegevus katkestati"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Viida lugemine \"%s\"-ist läks nässu."
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "\"%s\"-i oleku muutmine läks nässu."
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Spetsiaalfaili \"%s\" kopeerimine läks nässu."
diff --git a/po/eu.po b/po/eu.po
index 2be6232f9a2ad6e8086ae4d236a6cd9e7406ea3d..88d03e6660c786914e71b9ddbe7e90e5abdc9dd1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-06-14 22:57+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale <librezale@librezale.org>\n"
@@ -19,375 +19,331 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.2\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Fitxategiak eskuratzen..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Salto egin nahi al duzu?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Huts \"%s\" fitxategi argibideak zehazterakoan: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Huts \"%s\"-ren baimenak aldatzerakoan: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Huts \"%s\"-ren jabea aldatzerakoan: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Huts \"%s\"-ren taldea aldatzerakoan: %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr ""
-"\"%s\" fitxategia dagoeneko badago. Berau fitxategi huts batez ordeztu nahi "
-"al duzu?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Huts \"%s\" ezabatzerakoan.\n"
-"\n"
-"Alde batetara utzi nahi al duzu?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Huts \"%s\" fitxategi hutsa sortzerakoan.\n"
-"\n"
-"Alde batetara utzi nahi al duzu?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Huts karpeta edukiak irakurtzerakoan"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Errore ezezaguna"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Ez da Exec eremua zehaztu"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Ez da URL eremua zehaztu"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Idazmahai fitxategi baliogabea"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Huts fitxategia analizatzerakoan"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Fitxategi izen baliogabea"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Huts \"%s\" fitxategiaren egoera eskuratzekoan: %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Gainidatzi nahi al duzu?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Huts \"%s\" ezabatzerakoan: %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Huts %s fitxategitik aplikazioa kargatzerakoan"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Komandoa"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "Mime kudeatzailea abiarazteko komandoa"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Banderak"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Mime kudeatzailearen banderak"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Ikonoa"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Hautatu berrizendatzeko fitxategiak"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "Mime kudeatzailearen ikonoa"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Prestatzen..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Izena"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Huts \"%s\"-ren baimenak aldatzerakoan: %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Mime kudeatzailearen izena"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Huts \"%s\"-ren jabea aldatzerakoan: %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "%s dokumentua"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Huts \"%s\"-ren taldea aldatzerakoan: %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Huts \"%s\" direktorioa sortzerakoan: %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Bidea luzeegia buferrean sartzeko"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI-a luzeegia buferrean sartzeko"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Tamaina"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Desio den argazkitxo tamaina"
+msgid "The file \"%s\" already exists"
+msgstr "\"%s\" fitxategia badago dagoeneko"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Direktorioak ezabatzen..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Huts \"%s\" fifo bat sortzerakoan"
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Huts \"%s\" direktorioa ezabatzerakoan: %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Ezin da erro direktorioa aldatu"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Prestatzen..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Huts \"%s\" irakurketarako irekitzerakoan"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Bide baliogabea"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Huts \"%s\" idazketarako irekitzerakoan"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "\"%s\" erabiltzaile ezezaguna"
+msgid "Failed to write data to \"%s\""
+msgstr "Huts \"%s\"-ra datuak idazterakoan"
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Huts %s-ren muntatze puntua zehazterakoan"
+msgid "Failed to remove \"%s\""
+msgstr "Huts \"%s\" ezabatzerakoan"
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Huts HAL deabruarekin konektatzerakoan: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Huts \"%s\"-tik datuak irakurtzerakoan"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "%s-ren kopia"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "%s-ra lotura"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "%s-ren beste kopia bat"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "%s-ra beste lotura bat "
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "%s-ren hirugarren kopia"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "%s-ra hirugarren lotura"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%uth %s-ren kopia"
msgstr[1] "%uth %s-ren kopiak"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%uth %s-ren lotura"
msgstr[1] "%uth %s-ren loturak"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Huts \"%s\"-ren fitxategi argibideak zehazterakoan"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Huts \"%s\" direktorioa sortzerakoan"
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Huts \"%s\" fifo bat sortzerakoan"
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Izendun tutuak ez dira onartzen"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Huts \"%s\" irakurketarako irekitzerakoan"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Huts \"%s\" lotura sinbolikoa sortzerakoan"
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "\"%s\" fitxategia badago dagoeneko"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Huts \"%s\" idazketarako irekitzerakoan"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Lotura sinbolikoak ez dira onartzen"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Huts \"%s\"-tik datuak irakurtzerakoan"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Fitxategi Sistema"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Huts \"%s\" \"%s\"-era berrizendatzerakoan"
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Huts \"%s\" \"%s\"-era berrizendatzerakoan"
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Huts \"%s\" \"%s\"-era berrizendatzerakoan"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "\"%s\" Bidea ez da direktorio batena"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Huts \"%s\"-ra datuak idazterakoan"
+msgid "Failed to load application from file %s"
+msgstr "Huts %s fitxategitik aplikazioa kargatzerakoan"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Huts \"%s\" ezabatzerakoan"
+msgid "Failed to remove \"%s\": %s"
+msgstr "Huts \"%s\" ezabatzerakoan: %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Ekintza ezeztaturik"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Komandoa"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Huts \"%s\"-tik lotura helburua irakurtzerakoan"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "Mime kudeatzailea abiarazteko komandoa"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Banderak"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Mime kudeatzailearen banderak"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Ikonoa"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "Mime kudeatzailearen ikonoa"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Izena"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Mime kudeatzailearen izena"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Huts \"%s\" lotura sinbolikoa sortzerakoan"
+msgid "%s document"
+msgstr "%s dokumentua"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Huts \"%s\"-ren modua aldatzerakoan"
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Lotura sinbolikoak ez dira onartzen"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Bidea luzeegia buferrean sartzeko"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI-a luzeegia buferrean sartzeko"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Tamaina"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Desio den argazkitxo tamaina"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Fitxategiak eskuratzen..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Bide baliogabea"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Huts \"%s\"-ren fitxategi argibideak zehazterakoan"
+msgid "Unknown user \"%s\""
+msgstr "\"%s\" erabiltzaile ezezaguna"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Huts \"%s\" fitxategi berezia kopiatzerakoan"
+msgid "Failed to determine the mount point for %s"
+msgstr "Huts %s-ren muntatze puntua zehazterakoan"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Huts HAL deabruarekin konektatzerakoan: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -504,58 +460,148 @@ msgid "Sort items in descending order"
msgstr "Elementuak beraka sailkatu"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Huts ekintza abiarazterakoan"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Huts \"%s\" irekitzerakoan"
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Huts \"%s\" irekitzerakoan: %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Fitxategiak kopiatzen..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Lotura sinbolikoak sortzen..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Fitxategiak mugitzen..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Fitxategiak mugitzen..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Guztiz ziur al zaude \"%s\" betirako ezabatu nahi\n"
+"duzula?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Guztiz ziur al zaude hautaturiko fitxategia\n"
+"betirako ezabatu nahi duzula?"
+msgstr[1] ""
+"Guztiz ziur al zaude hautaturiko fitxategiak\n"
+"betirako ezabatu nahi dituzula?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Fitxategi bat ezabatu ezkero betirako galduko da."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Fitxategiak ezabatzen..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Fitxategiak sortzen..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Direktorioak sortzen..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Fitxategi _Hutsa"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Huts %s-ren muntatze puntua zehazterakoan"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Karpeta berri bat sortu \"%s\"-en"
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "_Karpeta Sortu..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Huts \"%s\" ezabatzerakoan"
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Fitxategiak ezabatzen..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Huts \"%s\"-ren aplikazio lehenetsia ezartzerakoan"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Ez da aplikaziorik hautatu"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -564,20 +610,20 @@ msgstr ""
"erabiltzen da."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Beste aplikazioa..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Honekin Ireki"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Komando pert_sonalizatu bat erabili:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -586,40 +632,39 @@ msgstr ""
"dagoen aplikazio batetarako"
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Nabigatu..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "_Lehenespen bezala erabili mota honetako fitxategientzat"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Huts \"%s\" aplikazio berria gehitzerakoan"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Huts \"%s\" abiarazterakoan"
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "Abiarazlea _kendu"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "<i>%s</i> eta \"%s\" motako fitxategiak honekin ireki:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -627,8 +672,7 @@ msgstr ""
" \"%s\" motako fitxategiak irekitzeko aplikazioa hautatzeko fitxategi "
"sistema arakatu."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -637,12 +681,12 @@ msgstr ""
"\"%s\" motako fitxategientzako lehenetsiriko aplikazioa hautatutakoarengatik "
"aldatu."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Ziur al zaude \"%s\" betirako ezabatu nahi duzula?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -656,39 +700,39 @@ msgstr ""
"Fitxategi Kudeatzailearen \"Honekin Ireki\" elkarrizketaz sorturiko "
"pertsonalizatutako aplikazio abiarazleak ezaba ditzakezu."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Aplikazio bat hautatu"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Fitxategi Guztiak"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Fitxategi Exekutagarriak"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perl Skript-ak"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Python Skript-ak"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Ruby Skript-ak"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shell Skript-ak"
@@ -708,7 +752,7 @@ msgid "Other Applications"
msgstr "Beste Aplikazioak"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Ez dago itsasteko ezer arbelean "
@@ -777,14 +821,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "Automatikoki _zabaldu zutabeak behar denean"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Ezezaguna"
@@ -796,7 +841,7 @@ msgstr "Direktorio zerrendatze konpaktoa"
msgid "Compact view"
msgstr "Ikuspegi konpaktoa"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Izen berria idatzi:"
@@ -822,16 +867,32 @@ msgstr "Xeheturiko direktorio zerrendatzea"
msgid "Details view"
msgstr "Xeheturiko ikuspegia"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "itzulpen kredituak"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Huts dokumentazio nabigatzailea irekitzerakoan"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Bai"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Bai dan_ari"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Ez"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Utzi"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "Hona _kopiatu"
@@ -886,7 +947,7 @@ msgstr "Jabea"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Baimenak"
@@ -902,14 +963,10 @@ msgstr "Fitxategia"
msgid "File Name"
msgstr "Fitxategi Izena"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Erro karpetak ez du gurasorik"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Fitxategi Sistema"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -945,14 +1002,14 @@ msgstr "Ikono Ikuspegia"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Ireki"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Leiho Berri batetan Ireki"
@@ -1086,12 +1143,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Hautaturiko fitxategia \"%s\"-ra bidali"
msgstr[1] "Hautaturiko fitxategiak \"%s\"-ra bidali"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "Apurturiko lotura"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1099,83 +1156,101 @@ msgstr[0] "Elementu %d (%s), Leku librea: %s"
msgstr[1] "%d elementu (%s), Leku librea: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "Elementu %d, Leku librea: %s"
msgstr[1] "%d elementu, Leku librea: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "Elementu %d"
msgstr[1] "%d elementu"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" apurturiko lotura"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) %s-ra lotzen du"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Irudi Tamaina:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "Elementu %d aukeraturik (%s)"
msgstr[1] "%d elementu aukeraturik (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "Elementu %d aukeraturik"
msgstr[1] "%d Elementu aukeraturik"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Tartea"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Bide botoiak arteko tartea"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "\"%s\" leiho honetan ireki"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "\"%s\" leiho berri batetan ireki"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Karpeta berri bat sortu \"%s\"-en"
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "_Karpeta Sortu..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1183,29 +1258,29 @@ msgstr ""
"Moztu edo Kopiatu komandoaz aurretik hautaturiko fitxategiak \"%s\" barnera "
"mugitu edo kopiatu"
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Karpetan Itsatsi"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "\"%s\" karpetaren propietateak bistarazi"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Propietateak"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Karpeta Berria"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Karpeta Berria Sortu"
@@ -1222,11 +1297,11 @@ msgstr "Koka_lekua:"
msgid "Failed to launch \"%s\""
msgstr "Huts \"%s\" abiaraztean"
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Ikono tamaina"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Bide sarrerako ikono tamaina"
@@ -1308,17 +1383,15 @@ msgid "Stop applying permissions recursively."
msgstr "Gelditu baimenak errekurtsiboki ezartzea"
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Galdera"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Errekurtsiboki ezarri?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
@@ -1327,11 +1400,11 @@ msgstr ""
"fitxategi guztietan aldaketa errekurtsiboki ezarri\n"
"nahi al duzu?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "Ez galdetu _niri berriz"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1341,29 +1414,29 @@ msgstr ""
"galdetuko. Aukera hau aldatzeko hobespen atalean egin dezakezu."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Huts taldea aldatzerakoan"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Huts baimen berriak ezartzerakoan"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Fitxategi jabe ezezaguna"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Karpeta baimenak automatikoki konpondu?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Karpeta baimenak konpondu"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1373,77 +1446,57 @@ msgstr ""
"edukiak irakurtzeko baimena duten erabiltzaileak bakarrik sartu ahal izango "
"dira karpeta honetan hemendik aurrera."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Bai"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Bai dan_ari"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Ez"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Utzi"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Fitxategi Kudeatzaile Hobespenak"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Ikuspegiak"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Lehenetsiriko Ikuspegia"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Karpeta _berriak hau erabiliaz ikusi:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Ikono Ikuspegia"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Zehazturiko Zerrenda Ikuspegia"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Zehazturiko zerrenda ikuspegia"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Azken Erabilitako Ikuspegia"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Sailkatu _karpetak fitxategien aurretik"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Aukera hau hautatu karpetak fitxategiak baino lehen zerrendatzeko karpeta "
"bat ordenatzean."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Argazkitxoak bi_starazi"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1451,11 +1504,11 @@ msgstr ""
"Aukera hau hautatu karpeta batetako aurreikusi daitezken fitxategiak "
"automatikoki sorturiko argazkitxo ikonoez bistaratzeko."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Testua ikono alboan"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1466,58 +1519,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Alboko panela"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Lotura Panela"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_Ikono tamaina:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Oso Txikia"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Txikiena"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Txikia"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normala"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Handia"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Handiena"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Oso handia"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Ikono _Ikurrak Bistarazi"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1526,19 +1579,19 @@ msgstr ""
"guztientzat lastre-marka panelean enblema ikonoak bistaratzeko hautatu "
"aukera hau."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Zuhaitz panela"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Ikono _Tamaina:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Ikono _Ikurrak Bistarazi"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1549,16 +1602,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Portaera"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "Klik _bakana elementuak aktibatzeko"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1566,7 +1622,7 @@ msgstr ""
"Ezarri sagu markatzailea zenbat denboraz egon behar den\n"
"elementu baten gainean berau hautatzeko:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1580,34 +1636,34 @@ msgstr ""
"mugituaz. Portaera hau oso erabilgarria da klik bakanak gaiturik daudenean "
"eta elementua abiarazi gabe hautatu bakarrik nahi duzunean."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Ezgaitua"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Ertaina"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Luzea"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "Klik _Bikoitza elementuak aktibatzeko"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Aurreratua"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Karpeta Baimenak"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1617,182 +1673,187 @@ msgstr ""
"karpetaren edukiari ere ezarri diezazkiokezu. Lehenetsiko\n"
"portaera behean aukeratu:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Beti galdetu"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Karpetari bakarrik ezarri"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Karpeta eta bere edukiei ezarri"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(ordu %lu falta da)"
msgstr[1] "(%lu ordu falta dira)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(minutu %lu falta da)"
msgstr[1] "(%lu minutu falta dira)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(segundu %lu falta da)"
msgstr[1] "(%lu segundu falta dira)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Orokorra"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Izena:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Mota:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Honekin Ireki:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Lotura Helburua:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Ezabatu"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Aldaketa:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Erabilia:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Tamaina:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Bolumena:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Leku Librea:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Ikurrak"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Propietateak"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Huts \"%s\" berrizendatzerakoan"
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Fitxategia"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "_Bidali"
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Fitxategi Kontestu Menua"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Fitxategiak Gehitu..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Fitxategi gehigarriak gehitu berrizendatzeko fitxategi zerrendara"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Garbitu"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Beheko fitxategi zerrenda garbitu"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Honi buruz"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Thunar Bulk rename-ri buruzko argibideak bistarazi"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Propietateak..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Hautatutako fitxategiaren propietateak bistarazi"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Fitxategia anitz berrizendatu"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "Fitxategiak Be_rrizendatu"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
"Hemen klik egin behean zerrendaturiko fitxategiak izen berrietara orain "
"berrizendatzeko."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Izen Berria"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr "Hemen klikatu berrizendaketa ekintzari buruzko dokumentazioa ikusteko."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1805,30 +1866,30 @@ msgstr ""
"instalatu baduzu ziurtatu \"Sinple Builtin Renamers\" plugin-a gaitu duzula."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Hautatu berrizendatzeko fitxategiak"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Audio Fitxategiak"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Irudi Fitxategiak"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Bideo Fitxategiak"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Berrizendatu..."
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1836,13 +1897,13 @@ msgstr ""
"\"Thunar Bulk Rename\" fitxategi anitz batera berrizendatzeko\n"
"lanabes boteretsu eta hedagarri bat da."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Fitxategia Ezabatu"
msgstr[1] "Fitxategiak Ezabatu"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] ""
@@ -1851,7 +1912,7 @@ msgstr[1] ""
"Ezabatu hautaturiko fitxategiak berrizendatzeko fitxategi zerrendatik"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Bulk Rename - Fitxategi Anitz Berrizendatu"
@@ -1899,120 +1960,120 @@ msgstr[0] "Hautatutako karpeta alboko paneleko loturetara gehitu"
msgstr[1] "Hautatutako karpetak alboko paneleko loturetara gehitu"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "Bolumena _Muntatu"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "Bolumena A_tera"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "Bolumena _Desmuntatu"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "Lotu_ra Ezabatu"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Lotura Berrize_ndatu"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "\"%s\" Bidea ez da direktorio batena"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Huts lotura berria gehitzerakoan"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Huts \"%s\" ateratzerakoan"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Huts \"%s\" muntatzerakoan"
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Huts \"%s\" desmuntatzerakoan"
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Hemen klikatu karpetaren guztizko tamaina kalkulua gelditzeko"
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Kalkulua utzia"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Kalkulatzen..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s Byte"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "elementu %u, %s guztira"
msgstr[1] "%u elementu, %s guztira"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Karpeta Kontestu Menua"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Karpeta huts bat sortu uneko karpetaren barnean"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "E_baki"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Kopiatu"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "It_sasi"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Moztu edo Kopiatu komandoaz aurretik hautaturiko fitxategiak mugitu edo "
"kopiatu"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Ezabatu"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2020,157 +2081,144 @@ msgstr ""
"Moztu edo Kopiatu komandoaz aurretik hautaturiko fitxategiak hautaturiko "
"karpetara mugitu edo kopiatu"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Fitxategi guzti_ak Hautatu"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Leiho honetako fitxategi guztiak hautatu"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Patroi _batez Hautatu..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Patroi zehatz bat betetzen duten fitxategiak hautatu"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Bi_koiztu"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Lotura E_gin"
msgstr[1] "Loturak E_gin"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "Be_rrizendatu..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Hautatutako fitxategia berrizendatu"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "_Dokumentua Sortu"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Karpeta edukiak kargatzen..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Fitxategi Huts Berria"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Fitxategi Huts Berria..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "\"%s\" txantiloietik Dokumentua Sortu"
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Guztiz ziur al zaude \"%s\" betirako ezabatu nahi\n"
-"duzula?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Guztiz ziur al zaude hautaturiko fitxategia\n"
-"betirako ezabatu nahi duzula?"
-msgstr[1] ""
-"Guztiz ziur al zaude hautaturiko fitxategiak\n"
-"betirako ezabatu nahi dituzula?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Fitxategi bat ezabatu ezkero betirako galduko da."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Patroiaz Hautatu"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Hautatu"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Patroia:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "\"%s\" Berrizendatu"
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "XDS arrastatze guneak hornituriko fitxategi izen baliogabea"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Huts \"%s\" URL-rako lotura bat sortzerakoan"
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Huts \"%s\" direktorioa irekitzerakoan"
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "Hautatutako fitxategia itsatsi komandoaz mugitzeko prestatu"
msgstr[1] "Hautatutako fitxategiak itsatsi komandoaz mugitzeko prestatu"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "Hautatutako fitxategia itsatsi komando bitartez kopiatzeko prestatu"
msgstr[1] ""
"Hautatutako fitxategiak itsatsi komando bitartez kopiatzeko prestatu"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Hautatutako fitxategia betirako ezabatu"
-msgstr[1] "Hautatutako fitxategiak betirako ezabatu"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Hautaturiko fitxategia bikoiztu"
+msgstr[1] "Hautaturiko fitxategiak bikoiztu"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Hautaturiko fitxategia bikoiztu"
msgstr[1] "Hautaturiko fitxategiak bikoiztu"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Hautatutako fitxategiarentzat lotura sinboliko bat sortu"
msgstr[1] "Hautatutako fitxategi bakoitzarentzat lotura sinboliko bat sortu"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Hautatutako fitxategia berrizendatu"
+msgstr[1] "Hautatutako fitxategia berrizendatu"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Hautatutako fitxategia berrizendatu"
+msgstr[1] "Hautatutako fitxategia berrizendatu"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Sortu"
@@ -2189,20 +2237,30 @@ msgstr "Ez dago txantiloirik instalaturik"
msgid "_Empty File"
msgstr "Fitxategi _Hutsa"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Kargatzen..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "Karpetan _Itsatsi"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "P_ropietateak"
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "_Leiho Berria Ireki"
@@ -2627,23 +2685,23 @@ msgid "Shutter Speed:"
msgstr "Ateratze Abiadura:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Softwarea:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Irudia"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Irudi Mota:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Irudi Tamaina:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2819,21 +2877,21 @@ msgstr "Espresio erregular baliogabea, %ld karaktere kokalekuan: %s"
msgid "Search & Replace"
msgstr "Bilatu eta Ordeztu"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "\"%s\" fitxategi konprimitua bezala bidali?"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "_Zuzenean bidali"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "Kon_primiturik bidali"
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
@@ -2843,18 +2901,18 @@ msgstr ""
"bidali aurretik fitxategi konprimitzea aukera dezakezu. Oso gomendagarria da "
"fitxategi handiak konprimitzea eposta bidez bidali aurretik."
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] "%d fitxategia pakete konprimitu bat bezala bidali?"
msgstr[1] "%d fitxategiak pakete konprimitu bat bezala bidali?"
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "Pa_kete bat bezala bidali"
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2868,28 +2926,28 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "Fitxategiak konprimitzen..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "ZIP komandoak errore batez amaitu du: %d"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr "Huts aldiroko direktorioa sortzerakoan"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Huts \"%s\" lotura sinbolikoa sortzerakoan"
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2897,7 +2955,7 @@ msgstr[0] "Huts fitxategi %d konprimitzerakoan"
msgstr[1] "Huts %d fitxategi konprimitzerakoan"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "Huts eposta berria sortzerakoan"
@@ -2905,6 +2963,33 @@ msgstr "Huts eposta berria sortzerakoan"
msgid "Mail Recipient"
msgstr "ePosta"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Huts HAL deabruarekin konektatzerakoan: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Ekintza Pertsonalizatuak"
@@ -3141,11 +3226,11 @@ msgstr "Amaiera elementu erabiltzailea deiturik root kontestuan"
msgid "Unknown closing element <%s>"
msgstr "Itxiera elementu ezezaguna <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Huts uca.xml fitxategiaren gordetze kokapena zehazterakoan"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Komandoa ez da konfiguratu"
@@ -3194,3 +3279,88 @@ msgstr "Karpeta Ireki Thunar-ekin"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Hautatutako direktorioak thunar-en ireki"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Hautatutako fitxategia betirako ezabatu"
+#~ msgstr[1] "Hautatutako fitxategiak betirako ezabatu"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Huts \"%s\"-ren baimenak aldatzerakoan: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Salto egin nahi al duzu?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Huts \"%s\" fitxategi argibideak zehazterakoan: %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "\"%s\" fitxategia dagoeneko badago. Berau fitxategi huts batez ordeztu "
+#~ "nahi al duzu?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Huts \"%s\" ezabatzerakoan.\n"
+#~ "\n"
+#~ "Alde batetara utzi nahi al duzu?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Huts \"%s\" fitxategi hutsa sortzerakoan.\n"
+#~ "\n"
+#~ "Alde batetara utzi nahi al duzu?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Huts \"%s\" fitxategiaren egoera eskuratzekoan: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Gainidatzi nahi al duzu?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Huts \"%s\" direktorioa sortzerakoan: %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Direktorioak ezabatzen..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Huts \"%s\" direktorioa ezabatzerakoan: %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Ezin da erro direktorioa aldatu"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Izendun tutuak ez dira onartzen"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Ekintza ezeztaturik"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Huts \"%s\"-tik lotura helburua irakurtzerakoan"
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Huts \"%s\"-ren modua aldatzerakoan"
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Huts \"%s\" fitxategi berezia kopiatzerakoan"
diff --git a/po/fi.po b/po/fi.po
index 5baf1ffbbbc7139fc527a86952f9c785ef20f1f6..835afee881c532e933e1857510d1b8501a8e9b25 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-06-12 22:28+0300\n"
"Last-Translator: Jari Rahkonen <jari.rahkonen@pp2.inet.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -16,373 +16,331 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Kerätään tiedostoja..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Ohitetaanko tiedosto?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Tiedoston \"%s\" tietojen selvittäminen epäonnistui: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Tiedoston \"%s\" käyttöoikeuksien muuttaminen epäonnistui: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Tiedoston \"%s\" omistajan vaihtaminen epäonnistui: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Tiedoston \"%s\" ryhmän vaihtaminen epäonnistui: %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Tiedosto \"%s\" on jo olemassa. Korvataanko se tyhjällä tiedostolla?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Kohteen \"%s\" poistaminen epäonnistui.\n"
-"\n"
-"Ohitetaanko kohde?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Tyhjän tiedoston \"%s\" luominen epäonnistui.\n"
-"\n"
-"Ohitetaanko tiedosto?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Hakemiston sisällön lukeminen epäonnistui"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Tuntematon virhe"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Exec-kenttää ei ole määritetty"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "URL-kenttää ei ole määritetty"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Epäkelpo desktop-tiedosto"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Tiedoston jäsentäminen epäonnistui"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Tiedostonimi ei kelpaa"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Tiedoston \"%s\" stat epäonnistui: %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Korvataanko tiedosto?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Kohteen \"%s\" poistaminen epäonnistui: %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Sovelluksen avaaminen tiedostosta %s epäonnistui"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Komento"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "Mime-käsittelijän suorituskomento"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Liput"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Mime-käsittelijän liput"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Kuvake"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Valitse nimettävät tiedostot"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "Mime-käsittelijän kuvake"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Valmistellaan..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nimi"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Tiedoston \"%s\" käyttöoikeuksien muuttaminen epäonnistui: %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Mime-käsittelijän nimi"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Tiedoston \"%s\" omistajan vaihtaminen epäonnistui: %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "%s-tiedosto"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Tiedoston \"%s\" ryhmän vaihtaminen epäonnistui: %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Hakemiston \"%s\" luominen epäonnistui: %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Polku ei mahdu puskuriin"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI ei mahdu puskuriin"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Koko"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Pienoiskuvan koko"
+msgid "The file \"%s\" already exists"
+msgstr "Tiedosto \"%s\" on jo olemassa"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Poistetaan hakemistoja..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Nimetyn putken \"%s\" luominen epäonnistui"
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Hakemiston \"%s\" poistaminen epäonnistui: %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Juurihakemistoa ei voi siirtää"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Valmistellaan..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Kohteen \"%s\" avaaminen luettavaksi epäonnistui"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Polku ei kelpaa"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Kohteen \"%s\" avaaminen kirjoitettavaksi epäonnistui"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Tuntematon käyttäjä \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "Kohteeseen \"%s\" ei voi kirjoittaa"
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Liitoskohdan määrittäminen kohteelle %s epäonnistui"
+msgid "Failed to remove \"%s\""
+msgstr "Kohdetta \"%s\" ei voi poistaa"
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "HAL-taustaprosessiin yhdistäminen epäonnistui: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Kohteesta \"%s\" ei voi lukea"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "kopio kohteesta %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "linkki kohteeseen %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "toinen kopio kohteesta %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "toinen linkki kohteeseen %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "kolmas kopio kohteesta %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "kolmas linkki kohteeseen %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "kopio %u kohteesta %s"
msgstr[1] "kopio %u kohteesta %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "linkki %u kohteeseen %s"
msgstr[1] "linkki %u kohteeseen %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Tiedoston \"%s\" tietojen selvittäminen epäonnistui"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Hakemiston \"%s\" luominen epäonnistui"
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Nimetyn putken \"%s\" luominen epäonnistui"
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Nimettyjä putkia ei tueta"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Kohteen \"%s\" avaaminen luettavaksi epäonnistui"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Symbolisen linkin \"%s\" luominen epäonnistui"
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Tiedosto \"%s\" on jo olemassa"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Kohteen \"%s\" avaaminen kirjoitettavaksi epäonnistui"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Symbolisia linkkejä ei tueta"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Kohteesta \"%s\" ei voi lukea"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Tiedostojärjestelmä"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Tiedoston \"%s\" nimeäminen muotoon \"%s\" epäonnistui."
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Tiedoston \"%s\" nimeäminen muotoon \"%s\" epäonnistui."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Tiedoston \"%s\" nimeäminen muotoon \"%s\" epäonnistui."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Polku \"%s\" ei osoita hakemistoon"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Kohteeseen \"%s\" ei voi kirjoittaa"
+msgid "Failed to load application from file %s"
+msgstr "Sovelluksen avaaminen tiedostosta %s epäonnistui"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Kohdetta \"%s\" ei voi poistaa"
+msgid "Failed to remove \"%s\": %s"
+msgstr "Kohteen \"%s\" poistaminen epäonnistui: %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Toiminto peruutettu"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Komento"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Linkin kohteen lukeminen lähteestä \"%s\" epäonnistui"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "Mime-käsittelijän suorituskomento"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Liput"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Mime-käsittelijän liput"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Kuvake"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "Mime-käsittelijän kuvake"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nimi"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Mime-käsittelijän nimi"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Symbolisen linkin \"%s\" luominen epäonnistui"
+msgid "%s document"
+msgstr "%s-tiedosto"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Kohteen \"%s\" tilan muuttaminen epäonnistui"
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Symbolisia linkkejä ei tueta"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Polku ei mahdu puskuriin"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI ei mahdu puskuriin"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Koko"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Pienoiskuvan koko"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Kerätään tiedostoja..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Polku ei kelpaa"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Tiedoston \"%s\" tietojen selvittäminen epäonnistui"
+msgid "Unknown user \"%s\""
+msgstr "Tuntematon käyttäjä \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Erikoistiedoston \"%s\" kopioiminen epäonnistui"
+msgid "Failed to determine the mount point for %s"
+msgstr "Liitoskohdan määrittäminen kohteelle %s epäonnistui"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "HAL-taustaprosessiin yhdistäminen epäonnistui: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -499,58 +457,148 @@ msgid "Sort items in descending order"
msgstr "Järjestä hakemiston sisältö laskevaan järjestykseen"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Toiminnon käynnistys epäonnistui"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Kohteen \"%s\" avaaminen epäonnistui"
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Kohteen \"%s\" avaaminen epäonnistui: %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Kopioidaan tiedostoja..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Luodaan symbolisia linkkejä..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Siirretään tiedostoja..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Siirretään tiedostoja..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Haluatko todella poistaa kohteen\n"
+"\"%s\" pysyvästi?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Haluatko todella poistaa valitun\n"
+"tiedoston pysyvästi?"
+msgstr[1] ""
+"Haluatko todella poistaa valitut\n"
+"tiedostot pysyvästi?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Tiedoston poistoa ei voi peruuttaa."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Poistetaan tiedostoja..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Luodaan tiedostoja..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Luodaan hakemistoja..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "T_yhjä tiedosto"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Liitoskohdan määrittäminen kohteelle %s epäonnistui"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Luo uusi hakemisto kohteeseen \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Luo _hakemisto..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Kohdetta \"%s\" ei voi poistaa"
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Poistetaan tiedostoja..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Oletussovelluksen asettaminen tiedostotyypille \"%s\" epäonnistui"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Sovellusta ei ole valittu"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -559,20 +607,20 @@ msgstr ""
"avaamiseen."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Muussa sovelluksessa..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Avaa sovelluksessa"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Käytä _mukautettua komentoa:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -581,40 +629,39 @@ msgstr ""
"yläpuoliselta sovelluslistalta."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Selaa..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Käytä _oletuksena tälle tiedostotyypille"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Uuden sovelluksen \"%s\" lisääminen epäonnistui"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Kohteen \"%s\" suorittaminen epäonnistui"
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "_Poista käynnistin"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Avaa <i>%s</i> ja muut tyypin \"%s\" tiedostot sovelluksessa:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -622,20 +669,19 @@ msgstr ""
"Selaa tiedostojärjestelmää valitaksesi sovelluksen, jolla tyypin \"%s\" "
"tiedostot avataan."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr "Vaihda valittu sovellus tiedostotyypin \"%s\" oletussovellukseksi."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Haluatko todella poistaa kohteen \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -649,39 +695,39 @@ msgstr ""
"Voit poistaa käynnistimen ainoastaan, jos se on luotu tiedostonhallinnan "
"\"Avaa sovelluksessa\" -dialogin mukautettu komento -laatikon avulla."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Valitse sovellus"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Kaikki tiedostot"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Suoritettavat tiedostot"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perl-skriptit"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Python-skriptit"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Ruby-skriptit"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shell-skriptit"
@@ -701,7 +747,7 @@ msgid "Other Applications"
msgstr "Muut sovellukset"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Leikepöydällä ei ole liitettävää"
@@ -770,14 +816,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "_Laajenna sarakkeet automaattisesti tarvittaessa"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Tuntematon"
@@ -789,7 +836,7 @@ msgstr "Kompakti hakemistonäkymä"
msgid "Compact view"
msgstr "Kompakti näkymä"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Syötä uusi nimi:"
@@ -815,16 +862,32 @@ msgstr "Yksityiskohtainen hakemistolistaus"
msgid "Details view"
msgstr "Yksityiskohtainen näkymä"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "Jari Rahkonen <jari.rahkonen@pp2.inet.fi>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Dokumentaatioselaimen avaaminen epäonnistui"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Kyllä"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Kyllä k_aikkiin"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Ei"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Peruuta"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Kopioi tähän"
@@ -879,7 +942,7 @@ msgstr "Omistaja"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Käyttöoikeudet"
@@ -895,14 +958,10 @@ msgstr "Tiedosto"
msgid "File Name"
msgstr "Tiedostonimi"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Juurella ei ole ylähakemistoa"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Tiedostojärjestelmä"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -938,14 +997,14 @@ msgstr "Kuvakenäkymä"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Avaa"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Avaa uudessa ikkunassa"
@@ -1079,12 +1138,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Lähetä valittu tiedosto kohteeseen \"%s\""
msgstr[1] "Lähetä valitut tiedostot kohteeseen \"%s\""
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "rikkinäinen linkki"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1092,83 +1151,101 @@ msgstr[0] "%d kohde (%s), vapaata tilaa: %s"
msgstr[1] "%d kohdetta (%s), vapaata tilaa: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d kohde, vapaata tilaa: %s"
msgstr[1] "%d kohdetta, vapaata tilaa: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d kohde"
msgstr[1] "%d kohdetta"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" rikkinäinen linkki"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) linkki kohteeseen %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Kuvan koko:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d kohde valittu (%s)"
msgstr[1] "%d kohdetta valittu (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d kohde valittu"
msgstr[1] "%d kohdetta valittu"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Välit"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Polkupainikkeiden välinen tyhjä tila"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Avaa \"%s\" tässä ikkunassa"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Avaa \"%s\" uudessa ikkunassa"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Luo uusi hakemisto kohteeseen \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Luo _hakemisto..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1176,29 +1253,29 @@ msgstr ""
"Siirrä tai kopioi leikkaa- tai kopioi-komennolla valittuja tiedostoja "
"kohteeseen \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Liitä hakemistoon"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Näytä hakemiston \"%s\" ominaisuudet"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Ominaisuudet"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Uusi hakemisto"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Luo uusi hakemisto"
@@ -1215,11 +1292,11 @@ msgstr "_Sijainti:"
msgid "Failed to launch \"%s\""
msgstr "Kohteen \"%s\" suorittaminen epäonnistui"
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Kuvakkeen koko"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Polkukentän kuvakkeen koko"
@@ -1301,17 +1378,15 @@ msgid "Stop applying permissions recursively."
msgstr "Keskeytä oikeuksien muuttaminen alikansioista."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Kysymys"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Asetetaanko alihakemistoille?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
@@ -1319,11 +1394,11 @@ msgstr ""
"Asetetaanko muutokset myös kaikille valitun\n"
"hakemiston alihakemistoille ja tiedostoille?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Muista valinta"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1333,29 +1408,29 @@ msgstr ""
"enää. Voit muuttaa valintaasi jälkeenpäin asetusdialogin kautta."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Ryhmän vaihtaminen epäonnistui"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Oikeuksien asettaminen epäonnistui"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Tuntematon tiedoston omistaja"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Korjataanko hakemiston käyttöoikeudet automaattisesti?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Korjaa hakemiston käyttöoikeudet"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1364,77 +1439,57 @@ msgstr ""
"Hakemiston käyttöoikeudet asetetaan yhtäläisiksi. Tämän jälkeen hakemistoon "
"pääsevät vain sellaiset käyttäjät, joilla on oikeus lukea hakemiston sisältö."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Kyllä"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Kyllä k_aikkiin"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Ei"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Peruuta"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Tiedostonhallinnan asetukset"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Näkymät"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Oletusnäkymä"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "_Uusien hakemistojen esitystapa:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Kuvakenäkymä"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Yksityiskohtainen listanäkymä"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Kompakti listanäkymä"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Viimeksi käytetty näkymä"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Järjestä _hakemistot ennen tiedostoja"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Valitse tämä hakemistojen näyttämiseksi ennen tiedostoja järjestäessäsi "
"hakemiston."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "_Näytä pienoiskuvat"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1442,11 +1497,11 @@ msgstr ""
"Valitse tämä nähdäksesi hakemiston esikatselukelpoiset tiedostot "
"automaattisesti luotuina pienoiskuvina."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Teksti kuvakkeiden vierellä"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1457,58 +1512,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Sivupaneeli"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Kirjanmerkkipaneeli"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_Kuvakkeen koko:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Erittäin pieni"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Pienempi"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Pieni"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normaali"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Suuri"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Suurempi"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Erittäin suuri"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Näytä _tunnuskuvat"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1516,19 +1571,19 @@ msgstr ""
"Valitse tämä näyttääksesi kirjanmerkkilistassa tunnuskuvat niille "
"kansioille, joille on sellaisia kansion ominaisuusdialogissa asetettu."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Hakemistopuupaneeli"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "K_uvakkeen koko:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Näytä kuvakkeiden tu_nnuskuvat"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1540,16 +1595,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Käytös"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "Aktivoi kohteet k_ertanapsautuksella"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1557,7 +1615,7 @@ msgstr ""
"Määritä _viive, jonka jälkeen kohde valitaan,\n"
"kun hiiren osoitinta pidetään sen yllä:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1571,34 +1629,34 @@ msgstr ""
"olla hyötyä, kun kertanapsautus aktivoi kohteen, mutta haluat vain valita "
"sen aktivoimatta."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Pois käytöstä"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Keskipitkä"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Pitkä"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "Aktivoi kohteet _kaksoisnapsautuksella"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Lisäasetukset"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Hakemiston käyttöoikeudet"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1608,181 +1666,186 @@ msgstr ""
"asettaa samat oikeudet myös sen sisällölle.\n"
"Alta voit valita oletustoimintatavan."
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Kysy aina"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Aseta vain hakemistolle"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Aseta myös hakemiston sisällölle"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu tunti jäljellä)"
msgstr[1] "(%lu tuntia jäljellä)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu minuutti jäljellä)"
msgstr[1] "(%lu minuuttia jäljellä)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(%lu sekunti jäljellä)"
msgstr[1] "(%lu sekuntia jäljellä)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Yleiset"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Nimi:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Tyyppi:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Avaa sovelluksessa:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Linkin kohde:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Poista"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Muokattu:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Käytetty:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Koko:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Taltio:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Vapaata tilaa:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Tunnuskuvat"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Ominaisuudet"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Tiedoston \"%s\" nimeäminen epäonnistui"
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Tiedosto"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "_Lähetä"
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Tiedoston kontekstivalikko"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Lisää tiedostoja..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Lisää tiedostoja uudelleen nimettävien tiedostojen listalle"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Tyhjennä"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Tyhjennä alla oleva tiedostolista"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Tietoja"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Näytä tietoja Thunarin joukkonimeäjästä"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Ominaisuudet..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Näytä valitun tiedoston ominaisuudet"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Nimeä useita tiedostoja uudelleen"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Nimeä uudelleen"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
"Napsauta tästä vahvistaaksesi ylläolevan listan tiedostojen nimeämisen."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Uusi nimi"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr "Napsauta tästä nähdäksesi valitun nimeämistoiminnon dokumentaation."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1793,30 +1856,30 @@ msgstr ""
"lähdekoodista, aseta käyttöön \"Simple Builtin Renamers\" -liitännäinen."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Valitse nimettävät tiedostot"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Äänitiedostot"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Kuvatiedostot"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Videotiedostot"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Joukkonimeäjä"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1824,20 +1887,20 @@ msgstr ""
"Thunarin joukkonimeäjä on tehokas ja laajennettavissa\n"
"oleva työkalu useiden tiedostojen uudelleennimeämiseen."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Poista tiedosto"
msgstr[1] "Poista tiedostot"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Poista valittu tiedosto nimettävien tiedostojen listalta"
msgstr[1] "Poista valitut tiedostot nimettävien tiedostojen listalta"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Joukkonimeäjä - nimeä useita tiedostoja"
@@ -1884,118 +1947,118 @@ msgstr[0] "Lisää valittu hakemisto kirjanmerkkipaneeliin"
msgstr[1] "Lisää valitut hakemistot kirjanmerkkipaneeliin"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Liitä taltio"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "P_oista levy"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_Irrota taltio"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_Poista kirjanmerkki"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "_Nimeä kirjanmerkki uudelleen"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Polku \"%s\" ei osoita hakemistoon"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Kirjanmerkin lisääminen epäonnistui"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Kohteen \"%s\" poistaminen asemasta epäonnistui"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Kohteen \"%s\" liittäminen epäonnistui"
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Kohteen \"%s\" irrottaminen epäonnistui"
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Napsauta tästä keskeyttääksesi hakemiston koon laskemisen."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Laskenta peruutettu"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Lasketaan..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s tavua"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u kohde, yhteensä %s"
msgstr[1] "%u kohdetta, yhteensä %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Hakemiston kontekstivalikko"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Luo tyhjä hakemisto nykyiseen sijaintiin"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "L_eikkaa"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Kopioi"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "_Liitä"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr "Siirrä tai kopioi leikkaa- tai kopioi-komennolla valittuja tiedostoja"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Poista"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2003,156 +2066,143 @@ msgstr ""
"Siirrä tai kopioi leikkaa- tai kopioi-komennolla valittuja tiedostoja "
"valittuun hakemistoon"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Valitse k_aikki tiedostot"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Valitse kaikki ikkunassa näkyvät tiedostot"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Valitse _hakukaavan avulla..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Valitse kaikki tiedostot, jotka sopivat tiettyyn hakukaavaan"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Luo k_opio"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "_Luo linkki"
msgstr[1] "_Luo linkit"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Nimeä uudelleen..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Nimeä valittu tiedosto uudelleen"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Luo asiaki_rja"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Ladataan hakemiston sisältöä..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Luo tyhjä tiedosto"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Uusi tyhjä tiedosto..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Luo asiakirja mallin \"%s\" pohjalta"
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Haluatko todella poistaa kohteen\n"
-"\"%s\" pysyvästi?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Haluatko todella poistaa valitun\n"
-"tiedoston pysyvästi?"
-msgstr[1] ""
-"Haluatko todella poistaa valitut\n"
-"tiedostot pysyvästi?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Tiedoston poistoa ei voi peruuttaa."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Valitse hakukaavan avulla"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Valitse"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Hakukaava:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Nimeä \"%s\" uudelleen"
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "XDS-raahauslähteen tarjoama tiedostonimi ei kelpaa"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Linkin luominen URL:iin \"%s\" epäonnistui"
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Hakemiston \"%s\" avaaminen epäonnistui"
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "Merkitse valittu tiedosto siirrettäväksi liitä-komennolla"
msgstr[1] "Merkitse valitut tiedostot siirrettäväksi liitä-komennolla"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "Merkitse valittu tiedosto kopioitavaksi liitä-komennolla"
msgstr[1] "Merkitse valitut tiedostot kopioitavaksi liitä-komennolla"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Poista valittu tiedosto lopullisesti"
-msgstr[1] "Poista valitut tiedostot lopullisesti"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Luo kopio valitusta tiedostosta"
+msgstr[1] "Luo kopiot valituista tiedostoista"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Luo kopio valitusta tiedostosta"
msgstr[1] "Luo kopiot valituista tiedostoista"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Luo symbolinen linkki valittuun tiedostoon"
msgstr[1] "Luo symboliset linkit valittuihin tiedostoihin"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Nimeä valittu tiedosto uudelleen"
+msgstr[1] "Nimeä valittu tiedosto uudelleen"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Nimeä valittu tiedosto uudelleen"
+msgstr[1] "Nimeä valittu tiedosto uudelleen"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Luo"
@@ -2171,20 +2221,30 @@ msgstr "Ei asiakirjamalleja asennettuna"
msgid "_Empty File"
msgstr "T_yhjä tiedosto"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Ladataan..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "_Liitä hakemistoon"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "_Ominaisuudet..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Avaa _uusi ikkuna"
@@ -2609,23 +2669,23 @@ msgid "Shutter Speed:"
msgstr "Sulkijan nopeus:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Ohjelmisto:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Kuva"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Kuvatyyppi:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Kuvan koko:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2800,21 +2860,21 @@ msgstr "Säännöllinen lauseke ei kelpaa merkkisijainnissa %ld: %s"
msgid "Search & Replace"
msgstr "Etsi ja korvaa"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "Lähetetäänkö \"%s\" pakattuna arkistona?"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "Lähetä _suoraan"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "Lähetä _pakattuna"
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
@@ -2824,18 +2884,18 @@ msgstr ""
"eli sellaisenaan vai pakataanko se ennen sähköpostiviestiin liittämistä. On "
"suositeltavaa, että suuret tiedostot lähetetään pakattuina."
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] "Lähetetäänkö %d tiedosto pakattuna arkistona?"
msgstr[1] "Lähetetäänkö %d tiedostoa pakattuna arkistona?"
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "Lähetä _arkistona"
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2849,28 +2909,28 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "Pakataan tiedostoja..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "ZIP-komennon suoritus epäonnistui (virhe %d)"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr "Väliaikaishakemiston luominen epäonnistui"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Symbolisen linkin luominen kohteelle \"%s\" epäonnistui"
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2878,7 +2938,7 @@ msgstr[0] "%d tiedoston pakkaaminen epäonnistui"
msgstr[1] "%d tiedoston pakkaaminen epäonnistui"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "Sähköpostiviestin luominen epäonnistui"
@@ -2886,6 +2946,33 @@ msgstr "Sähköpostiviestin luominen epäonnistui"
msgid "Mail Recipient"
msgstr "Postin vastaanottaja"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "HAL-taustaprosessiin yhdistäminen epäonnistui: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Mukautetut toiminnot"
@@ -3121,11 +3208,11 @@ msgstr "Sulkuelementin käsittelijää kutsuttiin juurikontekstissa"
msgid "Unknown closing element <%s>"
msgstr "Tuntematon sulkuelementti <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Tallennuskohteen selvittäminen tiedostolle uca.xml epäonnistui"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Komentoa ei ole asetettu"
@@ -3176,3 +3263,87 @@ msgstr "Avaa hakemisto Thunarissa"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Avaa valitut hakemistot Thunarissa"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Poista valittu tiedosto lopullisesti"
+#~ msgstr[1] "Poista valitut tiedostot lopullisesti"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Tiedoston \"%s\" käyttöoikeuksien muuttaminen epäonnistui: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Ohitetaanko tiedosto?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Tiedoston \"%s\" tietojen selvittäminen epäonnistui: %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "Tiedosto \"%s\" on jo olemassa. Korvataanko se tyhjällä tiedostolla?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Kohteen \"%s\" poistaminen epäonnistui.\n"
+#~ "\n"
+#~ "Ohitetaanko kohde?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Tyhjän tiedoston \"%s\" luominen epäonnistui.\n"
+#~ "\n"
+#~ "Ohitetaanko tiedosto?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Tiedoston \"%s\" stat epäonnistui: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Korvataanko tiedosto?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Hakemiston \"%s\" luominen epäonnistui: %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Poistetaan hakemistoja..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Hakemiston \"%s\" poistaminen epäonnistui: %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Juurihakemistoa ei voi siirtää"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Nimettyjä putkia ei tueta"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Toiminto peruutettu"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Linkin kohteen lukeminen lähteestä \"%s\" epäonnistui"
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Kohteen \"%s\" tilan muuttaminen epäonnistui"
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Erikoistiedoston \"%s\" kopioiminen epäonnistui"
diff --git a/po/fr.po b/po/fr.po
index b67b375b998849e786485d1a3eb6f6a6284ecf17..600da98b8a794541066ef5116b51a4686d8a6aa8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-07-10 19:33+0100\n"
"Last-Translator: Maximilian Schleiss <maxschleiss@bluewin.ch>\n"
"Language-Team: French <xfce-i18n@xfce.org>\n"
@@ -17,382 +17,331 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Récupération des fichiers..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Voulez-vous l'ignorer ?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Échec pour déterminer des informations sur le fichier \"%s\" : %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Échec au changement des droits de \"%s\" : %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Échec au changement de propriétaire de \"%s\" : %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Échec au changement de groupe de \"%s\" : %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid "The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Le fichier \"%s\" existe déjà . Voulez-vous le remplacer par un fichier vide ?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Impossible de supprimer %s.\n"
-"\n"
-"Voulez-vous l'ignorer ?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Échec à la création du fichier vide \"%s\".\n"
-"\n"
-"Voulez-vous l'ignorer ?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Échec à la lecture du contenu du dossier"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Erreur inconnue"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Aucun champ Exec spécifié"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Aucune URL spécifiée"
-#: ../thunar-vfs/thunar-vfs-info.c:403
-#: ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Fichier de bureau invalide"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Échec pour analyser le fichier"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Nom de fichier invalide"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Échec pour récupérer le statut du fichier \"%s\" : %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Voulez-vous l'écraser ?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Échec à la suppression de \"%s\" : %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Échec au chargement de l'application à partir du fichier %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Commande"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "La commande de gestion des types de fichier"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "États"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Les options à passer vers l'utilitaire de gestion des types de fichier"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Icône"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Sélectionner les fichiers à renommer"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "L'icône du gestionnaire des types de fichier"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Préparation..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94
-#: ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nom"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Échec au changement des droits de \"%s\" : %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Le nom du gestionnaire des types de fichier"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Échec au changement de propriétaire de \"%s\" : %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "document %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Échec au changement de groupe de \"%s\" : %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Échec à la création du répertoire \"%s\" : %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Chemin trop long pour être stockée dans le cache"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI trop longue pour être stockée dans le cache"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172
-#: ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Taille"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "La taille de vignette désirée"
+msgid "The file \"%s\" already exists"
+msgstr "Le fichier \"%s\" existe déjà "
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Suppression des répertoires..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Échec à la création du tube nommé \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Échec à la suppression du répertoire \"%s\" : %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Ne peut pas transférer le répertoire racine"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Préparation..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Échec à l'ouverture de \"%s\" en lecture"
-#: ../thunar-vfs/thunar-vfs-util.c:251
-#: ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Chemin invalide"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Échec à l'ouverture de \"%s\" en écriture"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Utilisateur inconnu \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "Échec à l'écriture de données vers \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Échec pour déterminer un point de montage pour %s"
+msgid "Failed to remove \"%s\""
+msgstr "Échec à la suppression de \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Échec à la connexion au serveur HAL : %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Échec à la lecture de données de \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "copie de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193
-#: ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "lien vers %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "autre copie de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "autre lien vers %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "troisième copie de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "troisième lien vers %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240
-#: ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%uème copie de %s"
msgstr[1] "%uème copie de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%uème lien vers %s"
msgstr[1] "%uème lien vers %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Échec à la détermination d'informations sur le fichier \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Échec à la création du répertoire \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Échec à la création du tube nommé \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Les tubes nommés ne sont pas supportés"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Échec à l'ouverture de \"%s\" en lecture"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Échec à la création du lien symbolique \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Le fichier \"%s\" existe déjà "
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Échec à l'ouverture de \"%s\" en écriture"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Les liens symboliques ne sont pas non supportés"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Échec à la lecture de données de \"%s\""
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Système de fichier"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Échec au changement de nom de \"%s\" en \"%s\"."
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Échec au changement de nom de \"%s\" en \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Échec au changement de nom de \"%s\" en \"%s\"."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Le chemin \"%s\" ne fait pas référence à un répertoire"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Échec à l'écriture de données vers \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "Échec au chargement de l'application à partir du fichier %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454
-#: ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Échec à la suppression de \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "Échec à la suppression de \"%s\" : %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Opération annulée"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Commande"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Échec à la lecture de la cible du lien de \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "La commande de gestion des types de fichier"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "États"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Les options à passer vers l'utilitaire de gestion des types de fichier"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Icône"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "L'icône du gestionnaire des types de fichier"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nom"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Le nom du gestionnaire des types de fichier"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508
-#: ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Échec à la création du lien symbolique \"%s\""
+msgid "%s document"
+msgstr "document %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Échec au changement de mode de \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526
-#: ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Les liens symboliques ne sont pas non supportés"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Chemin trop long pour être stockée dans le cache"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI trop longue pour être stockée dans le cache"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Taille"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "La taille de vignette désirée"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554
-#: ../thunar-vfs/thunar-vfs-xfer.c:615
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Récupération des fichiers..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Chemin invalide"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Échec à la détermination d'informations sur le fichier \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "Utilisateur inconnu \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Échec à la copie du fichier spécial \"%s\""
+msgid "Failed to determine the mount point for %s"
+msgstr "Échec pour déterminer un point de montage pour %s"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Échec à la connexion au serveur HAL : %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -509,176 +458,280 @@ msgid "Sort items in descending order"
msgstr "Trier les éléments par ordre décroissant"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Échec au lancement de l'opération"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Échec à l'ouverture de \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Échec à l'ouverture de \"%s\" : %s"
-#: ../thunar/thunar-application.c:836
-#: ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Copie des fichiers..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Création de liens symboliques..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Déplacement de fichiers..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Déplacement de fichiers..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Êtes-vous certain que vous voulez\n"
+"effacer \"%s\" définitivement ?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Êtes-vous certain de vouloir effacer de manière\n"
+"permanente le fichier sélectionné ?"
+msgstr[1] ""
+"Êtes-vous certain de vouloir effacer de manière\n"
+"permanente les %u fichiers sélectionnés ?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Si vous supprimez ce fichier, il sera définitivement perdu."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Suppression des fichiers..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Créations des fichiers..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Création de répertoires..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "_Fichier vide"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Échec pour déterminer un point de montage pour %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Créer un nouveau dossier dans \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Création d'un _dossier..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Échec à la suppression de \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Suppression des fichiers..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282
-#: ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Échec à l'affectation de l'application par défaut de \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Aucune application sélectionnée"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
-msgid "The selected application is used to open this and other files of type \"%s\"."
-msgstr "L'application sélectionnée est utilisée pour ouvrir ceci et d'autres fichiers de type \"%s\"."
+msgid ""
+"The selected application is used to open this and other files of type \"%s\"."
+msgstr ""
+"L'application sélectionnée est utilisée pour ouvrir ceci et d'autres "
+"fichiers de type \"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "Autre application..."
-#: ../thunar/thunar-chooser-dialog.c:225
-#: ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Ouvrir avec"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Utiliser une _commande personnalisée :"
-#: ../thunar/thunar-chooser-dialog.c:292
-msgid "Use a custom command for an application that is not available from the above application list."
-msgstr "Utiliser une commande personalisée pour une application qui n'est pas disponible depuis la liste d'applications ci-dessus."
+#: ../thunar/thunar-chooser-dialog.c:286
+msgid ""
+"Use a custom command for an application that is not available from the above "
+"application list."
+msgstr ""
+"Utiliser une commande personalisée pour une application qui n'est pas "
+"disponible depuis la liste d'applications ci-dessus."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Naviguer..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Utiliser cet utilitaire pour tous les fichiers de ce type"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Échec à l'ajout de la nouvelle application \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Échec à l'exécution de \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "Supp_rimer lanceur"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Ouvrir <i>%s</i> et les autres fichiers de type \"%s\" avec :"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
-msgid "Browse the file system to select an application to open files of type \"%s\"."
-msgstr "Naviguer sur le système de fichier pour choisir une application pour ouvrir les fichiers de type \"%s\"."
+msgid ""
+"Browse the file system to select an application to open files of type \"%s\"."
+msgstr ""
+"Naviguer sur le système de fichier pour choisir une application pour ouvrir "
+"les fichiers de type \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
-msgid "Change the default application for files of type \"%s\" to the selected application."
-msgstr "Utiliser par défaut l'application sélectionnée pour l'ouverture des fichiers de type « %s »."
+msgid ""
+"Change the default application for files of type \"%s\" to the selected "
+"application."
+msgstr ""
+"Utiliser par défaut l'application sélectionnée pour l'ouverture des fichiers "
+"de type « %s »."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Êtes-vous certain de vouloir supprimer \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
-"This will remove the application launcher that appears in the file context menu, but will not uninstall the application itself.\n"
+"This will remove the application launcher that appears in the file context "
+"menu, but will not uninstall the application itself.\n"
"\n"
-"You can only remove application launchers that were created using the custom command box in the \"Open With\" dialog of the file manager."
+"You can only remove application launchers that were created using the custom "
+"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-"Ceci supprimera l'application du menu contextuel du fichier mais ne désinstallera pas l'application en elle-même.\n"
+"Ceci supprimera l'application du menu contextuel du fichier mais ne "
+"désinstallera pas l'application en elle-même.\n"
"\n"
-"Seule les applications ajoutées via la commande \"utiliser une commande personnalisée\", de la fenêtre \"Ouvrir avec\" du gestionnaire de fichier, peuvent être supprimées. "
+"Seule les applications ajoutées via la commande \"utiliser une commande "
+"personnalisée\", de la fenêtre \"Ouvrir avec\" du gestionnaire de fichier, "
+"peuvent être supprimées. "
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Sélectionner une application"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Tous les fichiers"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Fichiers exécutables"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Scripts perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Scripts python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Scripts ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Scripts shell"
@@ -698,7 +751,7 @@ msgid "Other Applications"
msgstr "Autres applications"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Il n'y a rien à coller dans le presse-papier"
@@ -766,15 +819,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "Redimensionner automatiquement la taille des colonnes"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
-#: ../thunar/thunar-column-model.c:894
-#: ../thunar/thunar-list-model.c:726
+#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Inconnu"
@@ -786,8 +839,7 @@ msgstr "Liste compacte des répertoires"
msgid "Compact view"
msgstr "Vue compacte"
-#: ../thunar/thunar-create-dialog.c:180
-#: ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Entrer le nouveau nom :"
@@ -813,17 +865,32 @@ msgstr "Liste détaillée des répertoires"
msgid "Details view"
msgstr "Vue détails"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "crédits-traducteur"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255
-#: ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Échec à l'ouverture du navigateur de la documentation"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Oui"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Oui pour _tout"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Non"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Annuler"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Copier ici"
@@ -838,8 +905,7 @@ msgstr "_Lier ici"
#. display an error to the user
#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191
-#: ../thunar/thunar-launcher.c:518
+#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:518
#, c-format
msgid "Failed to execute file \"%s\""
msgstr "Échec à l'exécution du fichier \"%s\""
@@ -879,8 +945,7 @@ msgstr "Propriétaire"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96
-#: ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Permissions"
@@ -896,14 +961,10 @@ msgstr "Fichier"
msgid "File Name"
msgstr "Nom de fichier"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Le dossier racine n'a pas de père"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Système de fichier"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -925,7 +986,8 @@ msgstr "Aller vers le répertoire visité suivant"
#: ../thunar/thunar-icon-factory.c:675
#, c-format
msgid "Failed to load fallback icon from \"%s\" (%s). Check your installation!"
-msgstr "Impossible de charger l'icône de « %s » (%s). Véfiriez votre installation !"
+msgstr ""
+"Impossible de charger l'icône de « %s » (%s). Véfiriez votre installation !"
#: ../thunar/thunar-icon-view.c:191
msgid "Icon based directory listing"
@@ -936,19 +998,15 @@ msgid "Icon view"
msgstr "Vue d'icônes"
#. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:129
-#: ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794
-#: ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Ouvrir"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130
-#: ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805
-#: ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Ouvrir dans une nouvelle fenêtre"
@@ -956,16 +1014,15 @@ msgstr "Ouvrir dans une nouvelle fenêtre"
msgid "Open the selected directory in a new window"
msgstr "Ouvrir le répertoire sélectionné dans une nouvelle fenêtre"
-#: ../thunar/thunar-launcher.c:131
-#: ../thunar/thunar-launcher.c:133
+#: ../thunar/thunar-launcher.c:131 ../thunar/thunar-launcher.c:133
msgid "Open With Other _Application..."
msgstr "Ouvrir avec une autre _application..."
-#: ../thunar/thunar-launcher.c:131
-#: ../thunar/thunar-launcher.c:133
+#: ../thunar/thunar-launcher.c:131 ../thunar/thunar-launcher.c:133
#: ../thunar/thunar-launcher.c:858
msgid "Choose another application with which to open the selected file"
-msgstr "Choisissez une autre application avec laquelle ouvrir le fichier sélectionné"
+msgstr ""
+"Choisissez une autre application avec laquelle ouvrir le fichier sélectionné"
#: ../thunar/thunar-launcher.c:613
#, c-format
@@ -1039,8 +1096,7 @@ msgstr[1] "Exécuter les fichiers sélectionnés"
msgid "_Open With \"%s\""
msgstr "_Ouvrir avec \"%s\""
-#: ../thunar/thunar-launcher.c:834
-#: ../thunar/thunar-launcher.c:921
+#: ../thunar/thunar-launcher.c:834 ../thunar/thunar-launcher.c:921
#, c-format
msgid "Use \"%s\" to open the selected file"
msgid_plural "Use \"%s\" to open the selected files"
@@ -1076,7 +1132,8 @@ msgstr[1] "Bureau (Créer liens)"
msgid "Create a link to the selected file on the desktop"
msgid_plural "Create links to the selected files on the desktop"
msgstr[0] "Créer un lien symbolique vers le fichier sélectionné sur le bureau"
-msgstr[1] "Créer un lien symbolique vers les fichiers sélectionnés sur le bureau"
+msgstr[1] ""
+"Créer un lien symbolique vers les fichiers sélectionnés sur le bureau"
#: ../thunar/thunar-launcher.c:1238
#, c-format
@@ -1085,13 +1142,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Envoyer le fichier sélectionné vers \"%s\""
msgstr[1] "Envoyer les fichiers sélectionnés vers \"%s\""
-#: ../thunar/thunar-list-model.c:774
-#: ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "lien cassé"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1099,113 +1155,131 @@ msgstr[0] "%d élément (%s), espace libre : %s"
msgstr[1] "%d éléments (%s), espace libre : %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d élément, espace libre : %s"
msgstr[1] "%d éléments, espace libre : %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d élément"
msgstr[1] "%d éléments"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" lien cassé"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) lien vers %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Taille de l'image :"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d élément sélectionné (%s)"
msgstr[1] "%d éléments sélectionnés (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d élément sélectionné"
msgstr[1] "%d éléments sélectionnés"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Espace"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Quantité d'espace entre les boutons du chemin"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Ouvrir \"%s\" dans cette fenêtre"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Ouvrir \"%s\" dans une nouvelle fenêtre"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Créer un nouveau dossier dans \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312
-#: ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Création d'un _dossier..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
-msgid "Move or copy files previously selected by a Cut or Copy command into \"%s\""
-msgstr "Déplacer ou copier les fichiers précédemment sélectionnés par une commande couper ou copier dans \"%s\""
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into \"%s\""
+msgstr ""
+"Déplacer ou copier les fichiers précédemment sélectionnés par une commande "
+"couper ou copier dans \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Coller dans le dossier"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Affiche les propriétés du dossier \"%s\""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Propriétés"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790
-#: ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Nouveau dossier"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790
-#: ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Créer un nouveau dossier"
@@ -1217,17 +1291,16 @@ msgstr "Aller à ..."
msgid "_Location:"
msgstr "_Chemin :"
-#: ../thunar/thunar-location-entry.c:423
-#: ../thunar/thunar-window.c:1209
+#: ../thunar/thunar-location-entry.c:423 ../thunar/thunar-window.c:1209
#, c-format
msgid "Failed to launch \"%s\""
msgstr "Échec au lancement de \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Taille d'icône"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "La taille de l'icône pour le chemin d'accès"
@@ -1310,17 +1383,15 @@ msgid "Stop applying permissions recursively."
msgstr "Arrêter d'appliquer les droits récursivement."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Question"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Appliquer récursivement ?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
@@ -1328,208 +1399,223 @@ msgstr ""
"Voulez-vous appliquer vos changements récursivement\n"
"à tous les fichiers et sous-dossiers du dossier sélectionné?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Ne plus me poser cette question"
-#: ../thunar/thunar-permissions-chooser.c:626
-msgid "If you select this option your choice will be remembered and you won't be asked again. You can use the preferences dialog to alter your choice afterwards."
-msgstr "Si vous sélectionnez cette option, votre choix sera souvenu et la question ne vous sera plus posée. Vous pouvez utiliser la fenêtre de préférences pour modifier votre choix ultérieurement."
+#: ../thunar/thunar-permissions-chooser.c:623
+msgid ""
+"If you select this option your choice will be remembered and you won't be "
+"asked again. You can use the preferences dialog to alter your choice "
+"afterwards."
+msgstr ""
+"Si vous sélectionnez cette option, votre choix sera souvenu et la question "
+"ne vous sera plus posée. Vous pouvez utiliser la fenêtre de préférences pour "
+"modifier votre choix ultérieurement."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Échec au changement de groupe"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Échec à l'application de nouveaux droits"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Propriétaire du fichier inconnu"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Corriger les droits du dossier automatiquement ?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Corriger les droits d'un dossier"
-#: ../thunar/thunar-permissions-chooser.c:1072
-msgid "The folder permissions will be reset to a consistent state. Only users allowed to read the contents of this folder will be allowed to enter the folder afterwards."
-msgstr "Les droits du dossier seront remise dans un état cohérent. Seuls les utilisateurs autorisés à lire le contenu de ce dossier seront autorisés à entrer dans le dossier."
-
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Oui"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Oui pour _tout"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Non"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Annuler"
+#: ../thunar/thunar-permissions-chooser.c:1069
+msgid ""
+"The folder permissions will be reset to a consistent state. Only users "
+"allowed to read the contents of this folder will be allowed to enter the "
+"folder afterwards."
+msgstr ""
+"Les droits du dossier seront remise dans un état cohérent. Seuls les "
+"utilisateurs autorisés à lire le contenu de ce dossier seront autorisés à "
+"entrer dans le dossier."
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Préférences du gestionnaire de fichier"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Vues"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Vue par défaut"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Voir un _nouveau dossier en utilisant :"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "vue d'icônes"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "liste détaillée"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "liste compacte"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "dernière vue active"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Trier les _dossiers avant les fichiers"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
-msgstr "Sélectionner cette option pour lister les dossiers avant les fichiers quand vous trier un dossier."
+msgstr ""
+"Sélectionner cette option pour lister les dossiers avant les fichiers quand "
+"vous trier un dossier."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "_Montrer les miniatures"
-#: ../thunar/thunar-preferences-dialog.c:301
-msgid "Select this option to display previewable files within a folder as automatically generated thumbnail icons."
-msgstr "Choisir cette option pour afficher les fichiers prévisionnables dans un dossier par des icônes de miniatures générées automatiquement."
+#: ../thunar/thunar-preferences-dialog.c:294
+msgid ""
+"Select this option to display previewable files within a folder as "
+"automatically generated thumbnail icons."
+msgstr ""
+"Choisir cette option pour afficher les fichiers prévisionnables dans un "
+"dossier par des icônes de miniatures générées automatiquement."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Texte à côté des icônes"
-#: ../thunar/thunar-preferences-dialog.c:324
-msgid "Select this option to place the icon captions for items beside the icon rather than below the icon."
-msgstr "Sélectionner cette option pour placer la légende des éléments à côté de l'icône au lieu d'en dessous."
+#: ../thunar/thunar-preferences-dialog.c:317
+msgid ""
+"Select this option to place the icon captions for items beside the icon "
+"rather than below the icon."
+msgstr ""
+"Sélectionner cette option pour placer la légende des éléments à côté de "
+"l'icône au lieu d'en dessous."
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Panneau latéral"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Panneau des raccourcis"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "Taille d'i_cône :"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "très petit"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "plus petit"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "petit"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "normal"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "grand"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "plus grand"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "très grand"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Afficher les _emblèmes"
-#: ../thunar/thunar-preferences-dialog.c:385
-msgid "Select this option to display icon emblems in the shortcuts pane for all folders for which emblems have been defined in the folders properties dialog."
-msgstr "Sélectionner cette option pour afficher l'icône de l'emblème dans le panneau des raccourcis pour tous les dossiers pour lesquels des emblèmes ont été définies dans les propriétés de dossiers."
+#: ../thunar/thunar-preferences-dialog.c:378
+msgid ""
+"Select this option to display icon emblems in the shortcuts pane for all "
+"folders for which emblems have been defined in the folders properties dialog."
+msgstr ""
+"Sélectionner cette option pour afficher l'icône de l'emblème dans le panneau "
+"des raccourcis pour tous les dossiers pour lesquels des emblèmes ont été "
+"définies dans les propriétés de dossiers."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Panneau d'arborescence"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Taille d'i_cône :"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Afficher l'icône de l'e_mblème"
-#: ../thunar/thunar-preferences-dialog.c:436
-msgid "Select this option to display icon emblems in the tree pane for all folders for which emblems have been defined in the folders properties dialog."
-msgstr "Sélectionnez cette option pour afficher les emblèmes dans l'arborescence pour tous les dossiers pour lesquels des emblèmes ont été définies dans le propriétés des dossiers."
+#: ../thunar/thunar-preferences-dialog.c:429
+msgid ""
+"Select this option to display icon emblems in the tree pane for all folders "
+"for which emblems have been defined in the folders properties dialog."
+msgstr ""
+"Sélectionnez cette option pour afficher les emblèmes dans l'arborescence "
+"pour tous les dossiers pour lesquels des emblèmes ont été définies dans le "
+"propriétés des dossiers."
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Comportement"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "_Simple clic pour activer les éléments"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1538,38 +1624,49 @@ msgstr ""
"sélectionné lorsque le pointeur de la souris se\n"
"place dessus :"
-#: ../thunar/thunar-preferences-dialog.c:499
-msgid "When single-click activation is enabled, pausing the mouse pointer over an item will automatically select that item after the chosen delay. You can disable this behavior by moving the slider to the left-most position. This behavior may be useful when single clicks activate items, and you want only to select the item without activating it."
-msgstr "Lorsque l'exécution sur simple clique est activée, le fait d'arrêter le pointeur de la souris sur un élément le sélectionnera automatiquement après le délai choisi. Ce comportement peut être désactivé en déplaçant le curseur vers la position gauche absolue. Cela peut être utile lorsqu'un simple clique active les éléments et que vous voulez seulement sélectionner ceux-ci sans les activer."
-
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:492
+msgid ""
+"When single-click activation is enabled, pausing the mouse pointer over an "
+"item will automatically select that item after the chosen delay. You can "
+"disable this behavior by moving the slider to the left-most position. This "
+"behavior may be useful when single clicks activate items, and you want only "
+"to select the item without activating it."
+msgstr ""
+"Lorsque l'exécution sur simple clique est activée, le fait d'arrêter le "
+"pointeur de la souris sur un élément le sélectionnera automatiquement après "
+"le délai choisi. Ce comportement peut être désactivé en déplaçant le curseur "
+"vers la position gauche absolue. Cela peut être utile lorsqu'un simple "
+"clique active les éléments et que vous voulez seulement sélectionner ceux-ci "
+"sans les activer."
+
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "désactivé"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "moyen"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "long"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Double clic pour activer les éléments"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Avancé"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Permissions de dossier"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1579,185 +1676,189 @@ msgstr ""
"vous pouvez appliquer ces changements au contenu\n"
"du dossier. Sélectionner le comportement par défaut :"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "demander tout le temps"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "appliquer au dossier uniquement"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "appliquer au dossier et son contenu"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu houre restante)"
msgstr[1] "(%lu heures restantes)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu minute restante)"
msgstr[1] "(%lu minutes restantes)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(%lu seconde restante)"
msgstr[1] "(%lu secondes restantes)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Général"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Nom :"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Type :"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Ouvrir avec :"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Cible du lien :"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Effacer"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Modifié :"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Accédé :"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Taille :"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Volume :"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Espace libre :"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Emblèmes"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Propriétés"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Échec au changement de nom de \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173
-#: ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Fichier"
-#: ../thunar/thunar-renamer-dialog.c:174
-#: ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "_Envoyer vers"
-#: ../thunar/thunar-renamer-dialog.c:175
-#: ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Menu contextuel de fichier"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Ajouter des fichiers..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Inclure des fichiers additionnels dans la liste de fichiers à renommer"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Vider"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Vider la liste ci-dessous"
-#: ../thunar/thunar-renamer-dialog.c:179
-#: ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "À _propos"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Affiche des informations à propos de Thunar Bulk Rename"
-#: ../thunar/thunar-renamer-dialog.c:180
-#: ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Propriétés..."
-#: ../thunar/thunar-renamer-dialog.c:180
-#: ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Affiche les propriétés du fichier sélectionné"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Renommer plusieurs fichiers"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Renommer des fichiers"
-#: ../thunar/thunar-renamer-dialog.c:376
-msgid "Click here to actually rename the files listed above to their new names."
-msgstr "Cliquer ici pour renommer les fichiers listés ci-dessus vers leurs nouveaux noms."
+#: ../thunar/thunar-renamer-dialog.c:370
+msgid ""
+"Click here to actually rename the files listed above to their new names."
+msgstr ""
+"Cliquer ici pour renommer les fichiers listés ci-dessus vers leurs nouveaux "
+"noms."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Nouveau nom"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
-msgstr "Cliquez ici pour voir la documentation relative à l'opération de renommage sélectionnée."
+msgstr ""
+"Cliquez ici pour voir la documentation relative à l'opération de renommage "
+"sélectionnée."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1765,34 +1866,35 @@ msgid ""
msgstr ""
"Aucun module utile pour renommer n'a été trouvé sur votre système. \n"
"Vérifiez votre installation ou contactez l'administrateur à ce sujet. Si \n"
-"vous avez installé Thunar à partir des fichiers sources de l'application, soyez \n"
+"vous avez installé Thunar à partir des fichiers sources de l'application, "
+"soyez \n"
"certain d'avoir activé le greffon « intégré pour renommer simplement »."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Sélectionner les fichiers à renommer"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Fichiers audio"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Fichiers image"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Fichiers video"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Renommer"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1801,20 +1903,22 @@ msgstr ""
"puissant et extensible pour renommer plusieurs \n"
"fichiers à la fois."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Supprimer le fichier"
msgstr[1] "Supprimer les fichiers"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
-msgstr[0] "Supprimer le fichier sélectionné de la liste des fichiers à renommer"
-msgstr[1] "Supprimer les fichiers sélectionnés de la liste des fichiers à renommer"
+msgstr[0] ""
+"Supprimer le fichier sélectionné de la liste des fichiers à renommer"
+msgstr[1] ""
+"Supprimer les fichiers sélectionnés de la liste des fichiers à renommer"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Bulk Rename - Renommer plusieurs fichiers"
@@ -1824,8 +1928,15 @@ msgid "Failed to rename \"%s\" to \"%s\"."
msgstr "Échec au changement de nom de \"%s\" en \"%s\"."
#: ../thunar/thunar-renamer-progress.c:220
-msgid "You can either choose to skip this file and continue to rename the remaining files, or revert the previously renamed files to their previous names, or cancel the operation without reverting previous changes."
-msgstr "Vous pouvez choisir soit de passer ce fichier et continuer de renommer les autres fichiers, soit d'annuler les changements effectués aux fichiers précédants, soit d'interrompre l'opération sans annuler les modifications apportées."
+msgid ""
+"You can either choose to skip this file and continue to rename the remaining "
+"files, or revert the previously renamed files to their previous names, or "
+"cancel the operation without reverting previous changes."
+msgstr ""
+"Vous pouvez choisir soit de passer ce fichier et continuer de renommer les "
+"autres fichiers, soit d'annuler les changements effectués aux fichiers "
+"précédants, soit d'interrompre l'opération sans annuler les modifications "
+"apportées."
#: ../thunar/thunar-renamer-progress.c:225
msgid "_Revert Changes"
@@ -1837,8 +1948,10 @@ msgid "_Skip This File"
msgstr "_Ignorer ce fichier"
#: ../thunar/thunar-renamer-progress.c:232
-msgid "Do you want to skip this file and continue to rename the remaining files?"
-msgstr "Voulez-vous ignorer ce fichier et continuer à renommer les fichiers restant ?"
+msgid ""
+"Do you want to skip this file and continue to rename the remaining files?"
+msgstr ""
+"Voulez-vous ignorer ce fichier et continuer à renommer les fichiers restant ?"
#: ../thunar/thunar-shortcuts-pane.c:412
msgid "Side Pane (Create Shortcut)"
@@ -1849,287 +1962,272 @@ msgstr[1] "Panneau latéral (Créer raccourcis)"
#: ../thunar/thunar-shortcuts-pane.c:414
msgid "Add the selected folder to the shortcuts side pane"
msgid_plural "Add the selected folders to the shortcuts side pane"
-msgstr[0] "Ajouter le dossier sélectionné au panneau des raccourcis sur le côté"
-msgstr[1] "Ajouter les dossiers sélectionnés au panneau des raccourcis sur le côté"
+msgstr[0] ""
+"Ajouter le dossier sélectionné au panneau des raccourcis sur le côté"
+msgstr[1] ""
+"Ajouter les dossiers sélectionnés au panneau des raccourcis sur le côté"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
-#: ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Monter un volume"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
-#: ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "É_jecter un volume"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
-#: ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_Démonter un volume"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_Supprimer raccourci"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "_Renommer raccourci"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Le chemin \"%s\" ne fait pas référence à un répertoire"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Échec à l'ajout d'un nouveau raccourci"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
-#: ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Échec à l'éjection de \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
-#: ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Échec au montage de \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352
-#: ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Échec au démontage de nom de \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Cliquer ici pour arrêter le cacul de la taille total du dossier."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Calcul abandonné"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Calcul..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s octets"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u élément, totalisant %s"
msgstr[1] "%u éléments, totalisant %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Menu contextuel de dossier"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Crée un dossier vide dans le dossier courant"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314
-#: ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "Co_uper"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315
-#: ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Copier"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "C_oller"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr "Déplacer ou copier les fichiers précédemment coupés ou copiés"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317
-#: ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Effacer"
-#: ../thunar/thunar-standard-view.c:318
-msgid "Move or copy files previously selected by a Cut or Copy command into the selected folder"
-msgstr "Déplacer ou copier dans le dossier sélectionné les fichiers précédemment coupés ou copiés"
+#: ../thunar/thunar-standard-view.c:321
+msgid ""
+"Move or copy files previously selected by a Cut or Copy command into the "
+"selected folder"
+msgstr ""
+"Déplacer ou copier dans le dossier sélectionné les fichiers précédemment "
+"coupés ou copiés"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Sélectionner _tout les fichiers"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Sélectionner tous les fichiers dans cette fenêtre"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Sélectionner par _motif..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Sélectionner tous les fichiers qui correspondent à un certain motif"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Du_pliquer"
-#: ../thunar/thunar-standard-view.c:322
-#: ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "C_réer un lien"
msgstr[1] "C_réer des liens"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Renommer..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Renommer le fichier sélectionné"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Créer un _document"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Chargement du contenu du dossier..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Nouveau fichier vide"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Nouveau fichier vide..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Créer un document avec le modèle \"%s\""
-#: ../thunar/thunar-standard-view.c:1990
-#: ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Êtes-vous certain que vous voulez\n"
-"effacer \"%s\" définitivement ?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Êtes-vous certain de vouloir effacer de manière\n"
-"permanente le fichier sélectionné ?"
-msgstr[1] ""
-"Êtes-vous certain de vouloir effacer de manière\n"
-"permanente les %u fichiers sélectionnés ?"
-
-#: ../thunar/thunar-standard-view.c:2017
-#: ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Si vous supprimez ce fichier, il sera définitivement perdu."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Sélectionner par motif"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Sélectionner"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Motif :"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Renommer \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "Le nom de fichier fourni par XDS est non conforme"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Échec à la création d'un lien pour l'URL \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Échec à l'ouverture du répertoire \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
-msgstr[0] "Prépare le fichier sélectionné à être déplacé par la commande Coller"
-msgstr[1] "Prépare les fichiers sélectionnés à être déplacé par la commande Coller"
+msgstr[0] ""
+"Prépare le fichier sélectionné à être déplacé par la commande Coller"
+msgstr[1] ""
+"Prépare les fichiers sélectionnés à être déplacé par la commande Coller"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
-msgstr[0] "Préparer le fichier sélectionné à être copiés par une commande Coller"
-msgstr[1] "Préparer les fichiers sélectionnés à être copiés par une commande Coller"
+msgstr[0] ""
+"Préparer le fichier sélectionné à être copiés par une commande Coller"
+msgstr[1] ""
+"Préparer les fichiers sélectionnés à être copiés par une commande Coller"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Supprime définitivement le fichier sélectionné"
-msgstr[1] "Supprime définitivement les fichiers sélectionnés"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Duplique le fichier sélectionné"
+msgstr[1] "Duplique les fichiers sélectionnés"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Duplique le fichier sélectionné"
msgstr[1] "Duplique les fichiers sélectionnés"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Créer un lien symbolique pour le fichier sélectionné"
msgstr[1] "Créer un lien symbolique pour chaque fichier sélectionné"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Renommer le fichier sélectionné"
+msgstr[1] "Renommer le fichier sélectionné"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Renommer le fichier sélectionné"
+msgstr[1] "Renommer le fichier sélectionné"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Créer"
@@ -2148,20 +2246,30 @@ msgstr "Aucun modèle installé"
msgid "_Empty File"
msgstr "_Fichier vide"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Chargement..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "C_oller dans le dossier"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "P_ropriétés..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Ouvrir une _nouvelle fenêtre"
@@ -2343,7 +2451,9 @@ msgstr "Style de la barre d'_outils"
#: ../thunar/thunar-window.c:590
msgid "Traditional approach with location bar and navigation buttons"
-msgstr "Approche traditionnelle avec les la barre de chemin et les boutons de navigation"
+msgstr ""
+"Approche traditionnelle avec les la barre de chemin et les boutons de "
+"navigation"
#: ../thunar/thunar-window.c:596
msgid "_Hidden"
@@ -2396,17 +2506,26 @@ msgstr "À propos des modèles"
#: ../thunar/thunar-window.c:1748
msgid "All files in this folder will appear in the \"Create Document\" menu."
-msgstr "Tous les fichiers dans ce dossier apparaîtront dans le menu \"Créer un document\""
+msgstr ""
+"Tous les fichiers dans ce dossier apparaîtront dans le menu \"Créer un "
+"document\""
#: ../thunar/thunar-window.c:1755
msgid ""
-"If you frequently create certain kinds of documents, make a copy of one and put it in this folder. Thunar will add an entry for this document in the \"Create Document\" menu.\n"
+"If you frequently create certain kinds of documents, make a copy of one and "
+"put it in this folder. Thunar will add an entry for this document in the "
+"\"Create Document\" menu.\n"
"\n"
-"You can then select the entry from the \"Create Document\" menu and a copy of the document will be created in the directory you are viewing."
+"You can then select the entry from the \"Create Document\" menu and a copy "
+"of the document will be created in the directory you are viewing."
msgstr ""
-"Si vous créez fréquemment un certain type de document, faire une copie de l'un d'en eux et placer le dans ce dossier. Thunar ajoutera une entrée pour ce document dans le menu \"Créer un document\".\n"
+"Si vous créez fréquemment un certain type de document, faire une copie de "
+"l'un d'en eux et placer le dans ce dossier. Thunar ajoutera une entrée pour "
+"ce document dans le menu \"Créer un document\".\n"
"\n"
-"Vous pouvez alors sélectionner cette entrée dans le menu \"Créer un document\" et une copie de ce document sera créée dans le répertoire que vous utiliser."
+"Vous pouvez alors sélectionner cette entrée dans le menu \"Créer un document"
+"\" et une copie de ce document sera créée dans le répertoire que vous "
+"utiliser."
#: ../thunar/thunar-window.c:1767
msgid "Do _not display this message again"
@@ -2465,8 +2584,12 @@ msgid "Description:"
msgstr "Description :"
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:165
-msgid "The generic name of the entry, for example \"Web Browser\" in case of Firefox."
-msgstr "Le nom générique de l'entrée, par exemple « Navigateur Web » dans le cas de Firefox."
+msgid ""
+"The generic name of the entry, for example \"Web Browser\" in case of "
+"Firefox."
+msgstr ""
+"Le nom générique de l'entrée, par exemple « Navigateur Web » dans le cas de "
+"Firefox."
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:181
msgid "Command:"
@@ -2489,8 +2612,13 @@ msgid "Comment:"
msgstr "Commentaire :"
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:232
-msgid "Tooltip for the entry, for example \"View sites on the Internet\" in case of Firefox. Should not be redundant with the name or the description."
-msgstr "La bulle d'aide de l'entrée, par exemple \"Visualiser les sites sur Internet\" dans le cas de Firefox. Le texte doit éviter de répéter le nom ou la description."
+msgid ""
+"Tooltip for the entry, for example \"View sites on the Internet\" in case of "
+"Firefox. Should not be redundant with the name or the description."
+msgstr ""
+"La bulle d'aide de l'entrée, par exemple \"Visualiser les sites sur Internet"
+"\" dans le cas de Firefox. Le texte doit éviter de répéter le nom ou la "
+"description."
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:252
msgid "Options:"
@@ -2501,8 +2629,15 @@ msgid "Use _startup notification"
msgstr "Activer la _notification de démarrage"
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:259
-msgid "Select this option to enable startup notification when the command is run from the file manager or the menu. Not every application supports startup notification."
-msgstr "Sélectionner cette option pour activer la notification de démarrage lorsqu'une commande est exécutée depuis le gestionnaire de fichier ou le menu. À noter que certaines applications ne supportent pas ce type de notification."
+msgid ""
+"Select this option to enable startup notification when the command is run "
+"from the file manager or the menu. Not every application supports startup "
+"notification."
+msgstr ""
+"Sélectionner cette option pour activer la notification de démarrage "
+"lorsqu'une commande est exécutée depuis le gestionnaire de fichier ou le "
+"menu. À noter que certaines applications ne supportent pas ce type de "
+"notification."
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:266
msgid "Run in _terminal"
@@ -2510,7 +2645,9 @@ msgstr "Exécuter dans un _terminal"
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:267
msgid "Select this option to run the command in a terminal window."
-msgstr "Sélectionnez cette option pour exécuter la commande dans une fenêtre de terminal."
+msgstr ""
+"Sélectionnez cette option pour exécuter la commande dans une fenêtre de "
+"terminal."
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:342
msgid "Launcher"
@@ -2566,23 +2703,23 @@ msgid "Shutter Speed:"
msgstr "Vitesse d'obturation :"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Logiciels :"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Image"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Type de l'image :"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Taille de l'image :"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2717,15 +2854,23 @@ msgid "Regular _Expression"
msgstr "_Expression régulière"
#: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:231
-msgid "If you enable this option, the pattern will be treated as a regular expression and matched using the Perl-compatible regular expressions (PCRE). Check the documentation for details about the regular expression syntax."
-msgstr "Si vous activez cette option, le format sera traîté comme une expression régulière à l'aide d'un outil compatible avec Perl. Consultez la documentation pour de plus amples informations à propos de la syntaxe à utiliser pour les expressions régulières."
+msgid ""
+"If you enable this option, the pattern will be treated as a regular "
+"expression and matched using the Perl-compatible regular expressions (PCRE). "
+"Check the documentation for details about the regular expression syntax."
+msgstr ""
+"Si vous activez cette option, le format sera traîté comme une expression "
+"régulière à l'aide d'un outil compatible avec Perl. Consultez la "
+"documentation pour de plus amples informations à propos de la syntaxe à "
+"utiliser pour les expressions régulières."
#: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:238
msgid "Replace _With:"
msgstr "Remplacer _par :"
#: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:246
-msgid "Enter the text that should be used as replacement for the pattern above."
+msgid ""
+"Enter the text that should be used as replacement for the pattern above."
msgstr "Entrer le texte à utiliser pour remplacer le texte ci-dessus."
#: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:258
@@ -2733,8 +2878,12 @@ msgid "C_ase Sensitive Search"
msgstr "Recherche sensible à la casse"
#: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:260
-msgid "If you enable this option, the pattern will be searched in a case-sensitive manner. The default is to use a case-insensitive search."
-msgstr "Si vous activez cette option, le motif sera recherché de manière sensible à la casse. Par défaut la recherche est insensible à la casse."
+msgid ""
+"If you enable this option, the pattern will be searched in a case-sensitive "
+"manner. The default is to use a case-insensitive search."
+msgstr ""
+"Si vous activez cette option, le motif sera recherché de manière sensible à "
+"la casse. Par défaut la recherche est insensible à la casse."
#. setup a tooltip with the error message
#: ../plugins/thunar-sbr/thunar-sbr-replace-renamer.c:620
@@ -2746,63 +2895,78 @@ msgstr "Expression régulière invalide, au caractère %ld : %s"
msgid "Search & Replace"
msgstr "Chercher & remplacer"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "Envoyer \"%s\" en tant qu'archive compressée?"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "Envoyer _directement"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "Envoyer com_pressé"
-#: ../plugins/thunar-sendto-email/main.c:179
-msgid "When sending a file via email, you can either choose to send the file directly, as is, or compress the file before attaching it to an email. It is highly recommended to compress large files before sending them."
-msgstr "Lors de l'envoi d'un fichier par couriel, vous avez le choix entre l'envoyer directement en l'attachant au couriel ou en le compressant dans une archive et attacher cette dernière au couriel. Il est fortement conseillé de compresser les fichiers d'une certaine taille."
+#: ../plugins/thunar-sendto-email/main.c:178
+msgid ""
+"When sending a file via email, you can either choose to send the file "
+"directly, as is, or compress the file before attaching it to an email. It is "
+"highly recommended to compress large files before sending them."
+msgstr ""
+"Lors de l'envoi d'un fichier par couriel, vous avez le choix entre l'envoyer "
+"directement en l'attachant au couriel ou en le compressant dans une archive "
+"et attacher cette dernière au couriel. Il est fortement conseillé de "
+"compresser les fichiers d'une certaine taille."
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] "Envoyer le fichier %d en tant qu'archive compressée?"
msgstr[1] "Envoyer les fichiers %d en tant qu'archives compressées?"
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "Envoyer en tant qu'_archive"
-#: ../plugins/thunar-sendto-email/main.c:198
-msgid "When sending multiple files via email, you can either choose to send the files directly, attaching multiple files to an email, or send all files compressed into a single archive file and attach the archive. It is highly recommended to send multiple large files as archive."
-msgstr "Lors d'envois de fichiers par couriel, vous avez le choix entre les envoyer directement en les attachant tous au couriel ou en les compressant tous dans une archive et attacher cette dernière au couriel. Il est fortement conseillé de compresser les fichiers d'une certaine taille."
+#: ../plugins/thunar-sendto-email/main.c:197
+msgid ""
+"When sending multiple files via email, you can either choose to send the "
+"files directly, attaching multiple files to an email, or send all files "
+"compressed into a single archive file and attach the archive. It is highly "
+"recommended to send multiple large files as archive."
+msgstr ""
+"Lors d'envois de fichiers par couriel, vous avez le choix entre les envoyer "
+"directement en les attachant tous au couriel ou en les compressant tous dans "
+"une archive et attacher cette dernière au couriel. Il est fortement "
+"conseillé de compresser les fichiers d'une certaine taille."
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "Compression des fichiers..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "La commande ZIP s'est terminée avec l'erreur %d"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr "Échec à la création du répertoire temporaire"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Échec à la création d'un lien symbolique pour \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2810,7 +2974,7 @@ msgstr[0] "Échec à la compression du fichier %d"
msgstr[1] "Échec à la compression des fichiers %d"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "Échec à la création d'un nouveau couriel"
@@ -2818,6 +2982,33 @@ msgstr "Échec à la création d'un nouveau couriel"
msgid "Mail Recipient"
msgstr "Destinataire couriel"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Échec à la connexion au serveur HAL : %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Actions personnalisées."
@@ -2883,20 +3074,38 @@ msgid "_Description:"
msgstr "_Description :"
#: ../plugins/thunar-uca/thunar-uca-editor.c:168
-msgid "The description of the action that will be displayed as tooltip in the statusbar when selecting the item from the context menu."
-msgstr "La description de l'action qui apparaîtra comme astuce dans la barre de statut lorsque l'élément est sélectionné à partir du menu contextuel."
+msgid ""
+"The description of the action that will be displayed as tooltip in the "
+"statusbar when selecting the item from the context menu."
+msgstr ""
+"La description de l'action qui apparaîtra comme astuce dans la barre de "
+"statut lorsque l'élément est sélectionné à partir du menu contextuel."
#: ../plugins/thunar-uca/thunar-uca-editor.c:181
msgid "_Command:"
msgstr "_Commande :"
#: ../plugins/thunar-uca/thunar-uca-editor.c:190
-msgid "The command (including the necessary parameters) to perform the action. See the command parameter legend below for a list of supported parameter variables, which will be substituted when launching the command. When upper-case letters (e.g. %F, %D, %N) are used, the action will be applicable even if more than one item is selected. Else the action will only be applicable if exactly one item is selected."
-msgstr "La commande (incluant les paramètres nécessaires) pour exécuter cette action. Voir la légende des paramètres de commande pour une liste des paramètres variables supportés, qui seront substituées lorsque la commande est lancée. Quand une lettre majuscule (i.e. %F, %D, %N) est utilisée, l'action est applicable même si plus d'un élément est sélectionné. Sinon l'action est uniquement applicable à l'élément sélectionné."
+msgid ""
+"The command (including the necessary parameters) to perform the action. See "
+"the command parameter legend below for a list of supported parameter "
+"variables, which will be substituted when launching the command. When upper-"
+"case letters (e.g. %F, %D, %N) are used, the action will be applicable even "
+"if more than one item is selected. Else the action will only be applicable "
+"if exactly one item is selected."
+msgstr ""
+"La commande (incluant les paramètres nécessaires) pour exécuter cette "
+"action. Voir la légende des paramètres de commande pour une liste des "
+"paramètres variables supportés, qui seront substituées lorsque la commande "
+"est lancée. Quand une lettre majuscule (i.e. %F, %D, %N) est utilisée, "
+"l'action est applicable même si plus d'un élément est sélectionné. Sinon "
+"l'action est uniquement applicable à l'élément sélectionné."
#: ../plugins/thunar-uca/thunar-uca-editor.c:201
msgid "Browse the file system to select an application to use for this action."
-msgstr "Naviguer sur le système de fichier pour choisir une application à utiliser pour cette action."
+msgstr ""
+"Naviguer sur le système de fichier pour choisir une application à utiliser "
+"pour cette action."
#: ../plugins/thunar-uca/thunar-uca-editor.c:217
msgid "_Icon:"
@@ -2909,8 +3118,12 @@ msgid "No icon"
msgstr "Pas d'icône"
#: ../plugins/thunar-uca/thunar-uca-editor.c:226
-msgid "Click this button to select an icon file that will be displayed in the context menu in addition to the action name chosen above."
-msgstr "Cliquer sur ce bouton pour sélectionner l'icône qui apparaîtra dans le menu contextuel en plus du nom de l'action choisi au-dessus."
+msgid ""
+"Click this button to select an icon file that will be displayed in the "
+"context menu in addition to the action name chosen above."
+msgstr ""
+"Cliquer sur ce bouton pour sélectionner l'icône qui apparaîtra dans le menu "
+"contextuel en plus du nom de l'action choisi au-dessus."
#: ../plugins/thunar-uca/thunar-uca-editor.c:257
msgid ""
@@ -2955,8 +3168,16 @@ msgid "_File Pattern:"
msgstr "Motif de _fichier :"
#: ../plugins/thunar-uca/thunar-uca-editor.c:382
-msgid "Enter a list of patterns that will be used to determine whether this action should be displayed for a selected file. If you specify more than one pattern here, the list items must be separated with semicolons (e.g. *.txt;*.doc)."
-msgstr "Entrer une liste de motifs qui seront utilisés pour déterminer si oui ou non une action peut être effectuée pour le fichier sélectionné. Si vous spécifiez plus d'un motif ici, le caractère utilisé pour séparer les éléments de la liste est le point virgule (i.e. *.txt;*.doc)."
+msgid ""
+"Enter a list of patterns that will be used to determine whether this action "
+"should be displayed for a selected file. If you specify more than one "
+"pattern here, the list items must be separated with semicolons (e.g. *.txt;*."
+"doc)."
+msgstr ""
+"Entrer une liste de motifs qui seront utilisés pour déterminer si oui ou non "
+"une action peut être effectuée pour le fichier sélectionné. Si vous "
+"spécifiez plus d'un motif ici, le caractère utilisé pour séparer les "
+"éléments de la liste est le point virgule (i.e. *.txt;*.doc)."
#: ../plugins/thunar-uca/thunar-uca-editor.c:401
msgid "Appears if selection contains:"
@@ -3028,11 +3249,11 @@ msgstr "Gestionnaire d'élément de fin appelé durant le contexte source"
msgid "Unknown closing element <%s>"
msgstr "Élément de fermeture <%s> inconnu"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Échec à la détermination du lieu d'enregistrement pour uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Commande non configurée"
@@ -3041,8 +3262,11 @@ msgid "Configure c_ustom actions..."
msgstr "Configurer les actions pers_onnalisée..."
#: ../plugins/thunar-uca/thunar-uca-provider.c:189
-msgid "Setup custom actions that will appear in the file managers context menus"
-msgstr "Configurer les actions personnalisées qui apparaîtront dans les menus contextuels du gestionnaire de fichiers"
+msgid ""
+"Setup custom actions that will appear in the file managers context menus"
+msgstr ""
+"Configurer les actions personnalisées qui apparaîtront dans les menus "
+"contextuels du gestionnaire de fichiers"
#: ../plugins/thunar-uca/thunar-uca-provider.c:406
#, c-format
@@ -3081,3 +3305,87 @@ msgstr "Ouvrir un dossier avec Thunar"
msgid "Open the specified folders in Thunar"
msgstr "Ouvrir les dossiers spécifiés dans Thunar"
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Supprime définitivement le fichier sélectionné"
+#~ msgstr[1] "Supprime définitivement les fichiers sélectionnés"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Échec au changement des droits de \"%s\" : %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Voulez-vous l'ignorer ?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Échec pour déterminer des informations sur le fichier \"%s\" : %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "Le fichier \"%s\" existe déjà . Voulez-vous le remplacer par un fichier "
+#~ "vide ?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Impossible de supprimer %s.\n"
+#~ "\n"
+#~ "Voulez-vous l'ignorer ?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Échec à la création du fichier vide \"%s\".\n"
+#~ "\n"
+#~ "Voulez-vous l'ignorer ?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Échec pour récupérer le statut du fichier \"%s\" : %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Voulez-vous l'écraser ?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Échec à la création du répertoire \"%s\" : %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Suppression des répertoires..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Échec à la suppression du répertoire \"%s\" : %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Ne peut pas transférer le répertoire racine"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Les tubes nommés ne sont pas supportés"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Opération annulée"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Échec à la lecture de la cible du lien de \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Échec au changement de mode de \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Échec à la copie du fichier spécial \"%s\""
diff --git a/po/he.po b/po/he.po
index 2b464e604c4b8490ec6d3df6189fea502b3e9429..939278a56148fd3e4cb04a216c7c80450d46432d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-05-05 22:28+0300\n"
"Last-Translator: Yuval Tanny <tanai@int.gov.il>\n"
"Language-Team: Hebrew\n"
@@ -18,373 +18,331 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.2\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "×וסף קבצי×..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"×”×× ×‘×¨×¦×•× ×š לדלג על הקובץ?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "×œ× ×™×›×•×œ לטעון מידע ×ודות הקובץ \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת ההרש×ות של \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת ×”×‘×¢×œ×™× ×©×œ \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת הקבוצה של \"%s\": %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "הקובץ \"%s\" כבר קיי×. ×”×× ×‘×¨×¦×•× ×š להחליף ×ותו ×¢× ×§×•×‘×¥ ריק חדש?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"×œ× ×™×›×•×œ למחוק ×ת הקובץ \"%s\".\n"
-"\n"
-"×”×× ×‘×¨×¦×•× ×š לדלג עליו?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"×œ× ×™×›×•×œ ליצור ×ת הקובץ הריק \"%s\".\n"
-"\n"
-"×”×× ×‘×¨×¦×•× ×š לדלג עליו?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "×œ× ×™×›×•×œ ×œ×§×¨×•× ×ת תוכן התיקייה"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "בעיה ×œ× ×ž×•×›×¨×ª"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "מ××¤×™×™× ×™ שדה Exec ×œ× ×§×™×™×ž×™×"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "מ××¤×™×™× ×™ שדה URL ×œ× ×§×™×™×ž×™×"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "קובץ שולחן עבודה ×œ× ×ª×§×™×Ÿ"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "×œ× ×™×›×•×œ ×œ×¤×¢× ×— ×ת הקובץ"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "×©× ×§×•×‘×¥ ×œ× ×—×•×§×™"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr ""
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"×”×× ×œ×“×¨×•×¡ ×ת הקובץ הקיי×?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "×œ× ×™×›×•×œ למחוק ×ת \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "×œ× ×™×›×•×œ לטעון ×ת ×”×ª×•×›× ×” מהקובץ %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "פקודה"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "סמל"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "בחר ×§×‘×¦×™× ×œ×©×™× ×•×™ שמ×"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr ""
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "מכין..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "ש×"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת ההרש×ות של \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr ""
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת ×”×‘×¢×œ×™× ×©×œ \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "%s מסמך"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת הקבוצה של \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "×œ× ×™×›×•×œ ליצור ספרייה \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "גודל"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "גודל ×”×ª×ž×•× ×•×ª ×”×ž×•×§×˜× ×•×ª הרצוי"
+msgid "The file \"%s\" already exists"
+msgstr "הקובץ \"%s\" כבר קיי×."
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "מוחק סיפריות..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "×œ× ×™×›×•×œ ליצור ספרייה \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "×œ× ×™×›×•×œ למחוק ×ת הסיפרייה \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "×œ× ×™×›×•×œ להעביר ×ת ספריית השורש"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "מכין..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "×œ× ×™×›×•×œ לפתוח ×ת \"%s\" לקרי××”"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "× ×ª×™×‘ ×œ× ×—×•×§×™"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "×œ× ×™×›×•×œ לפתוח ×ת \"%s\" לכתיבה"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "×©× ×ž×©×ª×ž×© ×œ× ×ž×•×›×¨ \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "×œ× ×™×›×•×œ לכתוב × ×ª×•× ×™× ×ל \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "×œ× ×™×›×•×œ ×œ×ž×¦×•× × ×§×•×“×ª עיגון עבור %s"
+msgid "Failed to remove \"%s\""
+msgstr "×œ× ×™×›×•×œ למחוק ×ת \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "×œ× ×™×›×•×œ להתחבר ×ל HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "×œ× ×™×›×•×œ ×œ×§×¨×•× × ×ª×•× ×™× ×ž×ª×•×š \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "העתק של %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "קיצור דרך ×ל %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "עוד העתק של %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "עוד קישור ×ל %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "העתק שלישי של %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "קישור שלישי ×ל %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, fuzzy, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "העתק %uth של %s"
msgstr[1] "העתק %uth של %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, fuzzy, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "קישור %uth ×ל %s"
msgstr[1] "קישור %uth ×ל %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "×œ× ×™×›×•×œ ×œ×§×¨×•× ×ת מ××¤×™×™× ×™ הקובץ \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "×œ× ×™×›×•×œ ליצור ספרייה \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
+#, c-format
+msgid "Failed to create symbolic link \"%s\""
+msgstr "×œ× ×™×›×•×œ ליצור ×ת הקישור הסימבולי \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
-#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "×œ× ×™×›×•×œ לפתוח ×ת \"%s\" לקרי××”"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "הקובץ \"%s\" כבר קיי×."
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "מערכת קבצי×"
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "×œ× ×™×›×•×œ לפתוח ×ת \"%s\" לכתיבה"
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת ×©× \"%s\" ×ל \"%s\"."
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "×œ× ×™×›×•×œ ×œ×§×¨×•× × ×ª×•× ×™× ×ž×ª×•×š \"%s\""
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת ×©× \"%s\" ×ל \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת ×©× \"%s\" ×ל \"%s\"."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "הכתובת \"%s\" ×œ× ×ž×›×•×•× ×ª ×ל ספרייה"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "×œ× ×™×›×•×œ לכתוב × ×ª×•× ×™× ×ל \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "×œ× ×™×›×•×œ לטעון ×ת ×”×ª×•×›× ×” מהקובץ %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "×œ× ×™×›×•×œ למחוק ×ת \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "×œ× ×™×›×•×œ למחוק ×ת \"%s\": %s"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "פקודה"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "הפעולה בוטלה"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "×œ× ×™×›×•×œ ×œ×§×¨×•× ×ת מטרת הקישור מתוך \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "סמל"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "ש×"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "×œ× ×™×›×•×œ ליצור ×ת הקישור הסימבולי \"%s\""
+msgid "%s document"
+msgstr "%s מסמך"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת המצב של \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr ""
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "גודל"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "גודל ×”×ª×ž×•× ×•×ª ×”×ž×•×§×˜× ×•×ª הרצוי"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "×וסף קבצי×..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "× ×ª×™×‘ ×œ× ×—×•×§×™"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "×œ× ×™×›×•×œ ×œ×§×¨×•× ×ת מ××¤×™×™× ×™ הקובץ \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "×©× ×ž×©×ª×ž×© ×œ× ×ž×•×›×¨ \"%s\""
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "×œ× ×™×›×•×œ ×œ×ž×¦×•× × ×§×•×“×ª עיגון עבור %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "×œ× ×™×›×•×œ להעתיק קובץ מיוחד \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "×œ× ×™×›×•×œ להתחבר ×ל HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -501,140 +459,228 @@ msgid "Sort items in descending order"
msgstr "סדר ×ת ×”×¤×¨×™×˜×™× ×ž×”×¡×•×£ להתחלה"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "×œ× ×™×›×•×œ להתחיל תהליך"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "×œ× ×™×›×•×œ לפתוח ×ת \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "×œ× ×™×›×•×œ לפתוח ×ת \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "מעתיק קבצי×..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "יוצר ×§×™×©×•×¨×™× ×¡×™×ž×‘×•×œ×™×..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "מעביר קבצי×..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "מעביר קבצי×..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š\n"
+"למחוק לגמרי ×ת \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, fuzzy, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š\n"
+"למחוק לגמרי ×ת \"%s\"?"
+msgstr[1] ""
+"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š\n"
+"למחוק לגמרי ×ת \"%s\"?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "×× ×ª×ž×—×§ ×ת הקובץ, ×”×•× ×™×בד לתמיד ×•×œ× ×ª×•×›×œ לגשת ×ליו לעול×."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "מוחק קבצי×..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "יוצר קבצי×..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "יוצר ספריות..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "קובץ _ריק"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "×œ× ×™×›×•×œ ×œ×ž×¦×•× × ×§×•×“×ª עיגון עבור %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "צור תיקייה חדשה בתוך \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "צור _תיקייה..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "×œ× ×™×›×•×œ למחוק ×ת \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "מוחק קבצי×..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "×œ× ×™×›×•×œ להגדיר ×ª×•×›× ×ª ברירת מחדל עבור \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "×œ× × ×‘×—×¨×” ×ª×•×›× ×”"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
msgstr "×”×ª×•×›× ×” ×”× ×‘×—×¨×ª תפתח ×ת הקובץ ×”×–×” ×•×§×‘×¦×™× ××—×¨×™× ×ž×¡×•×’ \"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "×ª×•×›× ×” _×חרת..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "פתח בעזרת"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "השתמש בפקודה ×ישית:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
msgstr "השתמש בפקודה ×ישית עבור ×ª×•×›× ×” ×©×œ× × ×ž×¦×ת ברשימה למעלה."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_עיין..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "השתמש כברירת מחדל לסוג קובץ זה"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "×œ× ×™×›×•×œ להוסיף ×ת ×”×ª×•×›× ×” החדשה \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "×œ× ×™×›×•×œ להריץ ×ת \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
#, fuzzy
msgid "_Remove Launcher"
msgstr "משגר"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "פתח ×ת <i>%s</i> ×•×§×‘×¦×™× ××—×¨×™× ×ž×¡×•×’ \"%s\" בעזרת:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
msgstr "עיין במערכת ×”×§×‘×¦×™× ×›×“×™ לבחור ×ª×•×›× ×” שתפתח ×§×‘×¦×™× ×ž×¡×•×’ \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, fuzzy, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr ""
"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š\n"
"למחוק לגמרי ×ת \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -643,39 +689,39 @@ msgid ""
"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "בחר ×ª×•×›× ×”"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "כל הקבצי×"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "קבצי ריצה"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "תסריטי Perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "תסריטי Python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "תסריטי Ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "תסריטי Shell"
@@ -695,7 +741,7 @@ msgid "Other Applications"
msgstr "×ª×•×›× ×•×ª ×חרות"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "×ין ×©×•× ×“×‘×¨ בלוח כדי להדביק"
@@ -760,14 +806,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "×”_רחב ×ת גדלי העמודות ×וטומטית לפי הצורך"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "×œ× ×™×“×•×¢"
@@ -779,7 +826,7 @@ msgstr "×ª×¨×©×™× ×¡×¤×¨×™×™×” קומפקטי"
msgid "Compact view"
msgstr "תצוגה קומפקטית"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "הזן ×©× ×—×“×©:"
@@ -805,16 +852,32 @@ msgstr "×ª×¨×©×™× ×¡×¤×¨×™×™×” מפורט"
msgid "Details view"
msgstr "תצוגת רשימה מפורטת"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "תודות למתרגמי×"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "×œ× ×™×›×•×œ לפתוח ×ת דפדפן התיעוד"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_ל×"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_ביטול"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_העתק לכ×ן"
@@ -869,7 +932,7 @@ msgstr "בעל"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "הרש×ות"
@@ -885,14 +948,10 @@ msgstr "קובץ"
msgid "File Name"
msgstr "×©× ×§×•×‘×¥"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "לתיקיית השורש ×ין הורה"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "מערכת קבצי×"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -926,14 +985,14 @@ msgstr "תצוגת סמלי×"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_פתח"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "פתח בחלון חדש"
@@ -1071,12 +1130,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "פתח ×ת ×”×§×‘×¦×™× ×©× ×‘×—×¨×•"
msgstr[1] "פתח ×ת ×”×§×‘×¦×™× ×©× ×‘×—×¨×•"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "קישור שבור"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1084,112 +1143,130 @@ msgstr[0] "פריט %d (%s), ×ž×§×•× ×¤× ×•×™: %s"
msgstr[1] "%d ×¤×¨×™×˜×™× (%s), ×ž×§×•× ×¤× ×•×™: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "פריט %d, ×ž×§×•× ×¤× ×•×™: %s"
msgstr[1] "%d פריטי×, ×ž×§×•× ×¤× ×•×™: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "פריט %d"
msgstr[1] "%d פריטי×"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "קישור שבור \"%s\""
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) קישור ×ל %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "גודל ×ª×ž×•× ×”:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "פריט %d × ×‘×—×¨ (%s)"
msgstr[1] "%d ×¤×¨×™×˜×™× × ×‘×—×¨×• (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "פריט %d × ×‘×—×¨"
msgstr[1] "%d ×¤×¨×™×˜×™× × ×‘×—×¨×•"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr ""
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr ""
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "פתח ×ת \"%s\" בחלון ×–×”"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "פתח ×ת \"%s\" בחלון חדש"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "צור תיקייה חדשה בתוך \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "צור _תיקייה..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
msgstr "העבר ×ו הדבק ×ת ×”×§×‘×¦×™× ×©×‘×—×¨×ª ×§×•×“× ×‘×¢×–×¨×ª גזירה ×ו העתקה ×ל \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "הדבק ×ל תוך התיקייה"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, fuzzy, c-format
msgid "View the properties of the folder \"%s\""
msgstr "הצג ×ת המ××¤×™×™× ×™× ×©×œ הקובץ ×©× ×‘×—×¨"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
#, fuzzy
msgid "_Properties"
msgstr "מ××¤×™×™× ×™×..."
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "תיקייה חדשה"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "צור תיקייה חדשה"
@@ -1206,11 +1283,11 @@ msgstr "_כתובת:"
msgid "Failed to launch \"%s\""
msgstr ""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "גודל סמלי×"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr ""
@@ -1288,27 +1365,25 @@ msgid "Stop applying permissions recursively."
msgstr ""
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "ש×לה"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_×ל תש×ל ×ותי שוב"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1316,104 +1391,84 @@ msgid ""
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
"folder afterwards."
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr ""
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr ""
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_ל×"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_ביטול"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr ""
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "תצוגות"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "תצוגת ברירת מחדל"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "הצג תיקיות _חדשות בעזרת:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "תצוגת סמלי×"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "תצוגת רשימה מפורטת"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "תצוגת רשימה קומפקטית"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "תצוגה ××—×¨×•× ×” שבשימוש"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "סדר _תיקיות ×œ×¤× ×™ קבצי×"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "הצג _×ª×ž×•× ×•×ª ×ž×•×§×˜× ×•×ª"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1421,11 +1476,11 @@ msgstr ""
"סמן ×פשרות ×–×ת כדי להציג ×ª×ž×•× ×•×ª ×ž×•×§×˜× ×•×ª של תוכן ×”×§×‘×¦×™× ×¢×‘×•×¨ ×§×‘×¦×™× ×©×ž××¤×©×¨×™× "
"×–×ת."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_טקסט לצד הסמלי×"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1434,58 +1489,58 @@ msgstr "סמן ×פשרות זו כדי להציב ×ת טקסט הפריטי×
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "לוח הצד"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "לוח הקיצורי×"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_גודל הסמל:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "קטן מ×וד"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "קטן יותר"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "קטן"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "רגיל"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "גדול"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "גדול יותר"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "גדול מ×וד"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "הצג ×ת ×¡×™×ž×œ×•× ×™ הסמלי×"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1493,19 +1548,19 @@ msgstr ""
"סמן ×פשרות ×–×ת כדי להציג ×¡×™×ž×œ×•× ×™× ×‘×œ×•×— ×”×§×™×¦×•×¨×™× ×¢×‘×•×¨ כל התיקיות שהוגדרו להן "
"×¡×™×ž×œ×•× ×™× ×‘×—×œ×•×Ÿ מ××¤×™×™× ×™ התיקייה."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "לוח עץ המערכת"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "_גודל סמלי×:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "הצג _×¡×™×ž×œ×•× ×™ סמלי×"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1516,16 +1571,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "×”×ª× ×”×’×•×ª"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "לחיצה _×חת כדי להפעיל פריטי×"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1533,7 +1591,7 @@ msgstr ""
"בחר בזמן ×”_×”×ž×ª× ×” ×©× ×“×¨×© ×œ×¤× ×™ שהפריט\n"
"יסומן כשסמן העכבר עומד מעליו:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1546,34 +1604,34 @@ msgstr ""
"×פשרות ×–×ת שימושית כשמצב לחיצה ×חת מופעל ×× ×‘×¨×¦×•× ×š לבחור בפריט ×ž×¡×•×™×™× ×ž×‘×œ×™ "
"להפעיל ×ותו."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "כבוי"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "×‘×™× ×•× ×™"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "×רוך"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_שתי לחיצות כדי להפעיל פריטי×"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "מתקד×"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "הרש×ות תיקייה"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1583,180 +1641,185 @@ msgstr ""
"להחיל ×ת ×”×©×™× ×•×™×™× ×’× ×¢×œ התוכן שלה. בחר ×ת\n"
"×”×ª× ×”×’×•×ª ברירת המחדל ×›×ן:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "ש×ל בכל פע×"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "להחיל על תיקייה בלבד"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "להחיל על תיקייה ותוכן"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "כללי"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "ש×:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "סוג:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "פתח בעזרת:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "כתובת הקיצור:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_מחק"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "×©×•× ×”:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "הוגש:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "גודל:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "כרך:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "×ž×§×•× ×¤× ×•×™:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "×¡×™×ž×œ×•× ×™×"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, fuzzy, c-format
msgid "%s - Properties"
msgstr "מ××¤×™×™× ×™×..."
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת ×©× \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_קובץ"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_הוסף קבצי×..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "× ×§×”"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_×ודות"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "מ××¤×™×™× ×™×..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "הצג ×ת המ××¤×™×™× ×™× ×©×œ הקובץ ×©× ×‘×—×¨"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "×©× ×” שמות ×§×‘×¦×™× ×¨×‘×™×"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_×©× ×” ×©× ×œ×§×‘×¦×™×"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "לחץ ×›×ן כדי ×œ×©× ×•×ª ב×מת ×”×§×‘×¦×™× ×©×©×ž×•×ª×™×”× ×ž×•×¤×™×¢×™× ×œ×ž×¢×œ×” ×œ×©×ž× ×”×—×“×©"
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "×©× ×—×“×©"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1764,49 +1827,49 @@ msgid ""
msgstr ""
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "בחר ×§×‘×¦×™× ×œ×©×™× ×•×™ שמ×"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "קבצי קול"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "קבצי ×ª×ž×•× ×”"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr ""
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "מחק קובץ"
msgstr[1] "מחק קבצי×"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] ""
msgstr[1] ""
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr ""
@@ -1851,277 +1914,264 @@ msgstr[0] "הוסף ×ת התיקייה ×©× ×‘×—×¨×” ×ל לוח הקיצורי
msgstr[1] "הוסף ×ת התיקייה ×©× ×‘×—×¨×” ×ל לוח ×”×§×™×¦×•×¨×™× ×”×¦×™×“×™"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_עגן כרך"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "_×”×•×¦× ×›×¨×š"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_× ×ª×§ כרך"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_הסר קיצור"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "_×©× ×” ×©× ×œ×§×™×¦×•×¨"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "הכתובת \"%s\" ×œ× ×ž×›×•×•× ×ª ×ל ספרייה"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "×œ× ×™×›×•×œ להוסיף קיצור חדש"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "×œ× ×™×›×•×œ ×œ×”×•×¦×™× ×ת \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "×œ× ×™×›×•×œ לעגן ×ת \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "×œ× ×™×›×•×œ ×œ× ×ª×§ ×ת \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr ""
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
#, fuzzy
msgid "Calculation aborted"
msgstr "מחשב..."
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "מחשב..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s בייתי×"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, fuzzy, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "פריט %u, סך הכל %s"
msgstr[1] "פריט %u, סך הכל %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "תפריט התיקייה"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "צור תיקייה ריקה בתוך התיקייה ×”× ×•×›×—×™×ª"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "_גזור"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_העתק"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "ה_דבק"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr "העבר ×ו הדבק ×ת ×”×§×‘×¦×™× ×©×‘×—×¨×ª ×§×•×“× ×‘×¢×–×¨×ª גזירה ×ו העתקה"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_מחק"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
msgstr ""
"העבר ×ו הדבק ×ת ×”×§×‘×¦×™× ×©×‘×—×¨×ª ×§×•×“× ×‘×¢×–×¨×ª גזירה ×ו העתקה ×ל התיקייה ×”× ×‘×—×¨×ª"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "בחר ב_כל הקבצי×"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "בחר בכל ×”×§×‘×¦×™× ×©×‘×—×œ×•×Ÿ ×–×”"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "בחר לפי _×ª×‘× ×™×ª..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "בחר בכל ×”×§×‘×¦×™× ×©×ª×•××ž×™× ×œ×ª×‘× ×™×ª מסויימת"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "_שכפל"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "צור _קישור"
msgstr[1] "צור _קישורי×"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_×©× ×” ש×..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "×©× ×” ×ת ×©× ×”×§×•×‘×¥ ×”× ×‘×—×¨"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "צור _מסמך"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "טוען ×ת תוכן התיקייה..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "קובץ ריק חדש"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "קובץ ריק חדש..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "יצירת מסמך בעזרת ×”×ª×‘× ×™×ª \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š\n"
-"למחוק לגמרי ×ת \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, fuzzy, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š\n"
-"למחוק לגמרי ×ת \"%s\"?"
-msgstr[1] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š\n"
-"למחוק לגמרי ×ת \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "×× ×ª×ž×—×§ ×ת הקובץ, ×”×•× ×™×בד לתמיד ×•×œ× ×ª×•×›×œ לגשת ×ליו לעול×."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "בחר לפי ×ª×‘× ×™×ª"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_בחר"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_×ª×‘× ×™×ª:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "×©× ×” ×ת ×©× \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, fuzzy, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "×œ× ×™×›×•×œ ליצור ×ת הקישור הסימבולי \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "×œ× ×™×›×•×œ לפתח ×ת הסיפרייה \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
#, fuzzy
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "הכן ×ת הקובץ שבחרת להיות מועבר ×œ×ž×™×§×•× ×—×“×© בעזרת הדבקה"
msgstr[1] "הכן ×ת הקובץ שבחרת להיות מועבר ×œ×ž×™×§×•× ×—×“×© בעזרת הדבקה"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
#, fuzzy
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "הכן ×ת הקובץ שבחרת להיות מועתק ×œ×ž×§×•× ×—×“×© בעזרת הדבקה"
msgstr[1] "הכן ×ת הקובץ שבחרת להיות מועתק ×œ×ž×§×•× ×—×“×© בעזרת הדבקה"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "למחוק לגמרי ×ת הקובץ ×”× ×‘×—×¨"
-msgstr[1] "למחוק לגמרי ×ת ×”×§×‘×¦×™× ×”× ×‘×—×¨×™×"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "שכפל ×ת הקובץ ×©× ×‘×—×¨"
+msgstr[1] "שכפל ×ת ×”×§×‘×¦×™× ×©× ×‘×—×¨×•"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "שכפל ×ת הקובץ ×©× ×‘×—×¨"
msgstr[1] "שכפל ×ת ×”×§×‘×¦×™× ×©× ×‘×—×¨×•"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "צור קישור סימבולי עבור הקובץ ×©× ×‘×—×¨"
msgstr[1] "צור קישור סימבולי עבור כל ×חד ×ž×”×§×‘×¦×™× ×©× ×‘×—×¨×•"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "×©× ×” ×ת ×©× ×”×§×•×‘×¥ ×”× ×‘×—×¨"
+msgstr[1] "×©× ×” ×ת ×©× ×”×§×•×‘×¥ ×”× ×‘×—×¨"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "×©× ×” ×ת ×©× ×”×§×•×‘×¥ ×”× ×‘×—×¨"
+msgstr[1] "×©× ×” ×ת ×©× ×”×§×•×‘×¥ ×”× ×‘×—×¨"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "צור"
@@ -2140,20 +2190,30 @@ msgstr "×ין ×ª×‘× ×™×•×ª ×ž×•×ª×§× ×•×ª"
msgid "_Empty File"
msgstr "קובץ _ריק"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "טוען..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "_הדבק ×ל תוך התיקייה"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "_מ××¤×™×™× ×™×..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "פתח חלון _חדש"
@@ -2567,23 +2627,23 @@ msgid "Shutter Speed:"
msgstr "מהירות צמצ×:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "×ª×•×›× ×”:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "×ª×ž×•× ×”"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "סוג ×ª×ž×•× ×”:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "גודל ×ª×ž×•× ×”:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2755,39 +2815,39 @@ msgstr ""
msgid "Search & Replace"
msgstr "חפש והחלף"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2797,30 +2857,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "מעתיק קבצי×..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "×œ× ×™×›×•×œ ליצור ספרייה \"%s\""
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "×œ× ×™×›×•×œ ליצור ×ת הקישור הסימבולי \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2828,7 +2888,7 @@ msgstr[0] "×œ× ×™×›×•×œ לפתוח קובץ %d"
msgstr[1] "×œ× ×™×›×•×œ לפתוח קובץ %d"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "×œ× ×™×›×•×œ לפתוח קובץ %d"
@@ -2837,6 +2897,33 @@ msgstr "×œ× ×™×›×•×œ לפתוח קובץ %d"
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "×œ× ×™×›×•×œ להתחבר ×ל HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "פעולות ×ישיות"
@@ -3048,11 +3135,11 @@ msgstr ""
msgid "Unknown closing element <%s>"
msgstr ""
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr ""
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "פקודה ×œ× ×ž×•×’×“×¨×ª"
@@ -3101,3 +3188,80 @@ msgstr "פתח תיקייה ×¢× Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "פתח ×ת התיקיות ×©×¦×•×™×™× ×• ×¢× Thunar"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "למחוק לגמרי ×ת הקובץ ×”× ×‘×—×¨"
+#~ msgstr[1] "למחוק לגמרי ×ת ×”×§×‘×¦×™× ×”× ×‘×—×¨×™×"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת ההרש×ות של \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "×”×× ×‘×¨×¦×•× ×š לדלג על הקובץ?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "×œ× ×™×›×•×œ לטעון מידע ×ודות הקובץ \"%s\": %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "הקובץ \"%s\" כבר קיי×. ×”×× ×‘×¨×¦×•× ×š להחליף ×ותו ×¢× ×§×•×‘×¥ ריק חדש?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "×œ× ×™×›×•×œ למחוק ×ת הקובץ \"%s\".\n"
+#~ "\n"
+#~ "×”×× ×‘×¨×¦×•× ×š לדלג עליו?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "×œ× ×™×›×•×œ ליצור ×ת הקובץ הריק \"%s\".\n"
+#~ "\n"
+#~ "×”×× ×‘×¨×¦×•× ×š לדלג עליו?"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "×”×× ×œ×“×¨×•×¡ ×ת הקובץ הקיי×?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "×œ× ×™×›×•×œ ליצור ספרייה \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "מוחק סיפריות..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "×œ× ×™×›×•×œ למחוק ×ת הסיפרייה \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "×œ× ×™×›×•×œ להעביר ×ת ספריית השורש"
+
+#~ msgid "Operation canceled"
+#~ msgstr "הפעולה בוטלה"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "×œ× ×™×›×•×œ ×œ×§×¨×•× ×ת מטרת הקישור מתוך \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "×œ× ×™×›×•×œ ×œ×©× ×•×ª ×ת המצב של \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "×œ× ×™×›×•×œ להעתיק קובץ מיוחד \"%s\""
diff --git a/po/hu.po b/po/hu.po
index b24674a3d124091287baff3755eca7132df98221..d7e077d8db6ce2737f175ff0b183374ddacb2007 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-06-12 08:57+0100\n"
"Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -18,371 +18,329 @@ msgstr ""
"X-Poedit-Language: Hungarian\n"
"X-Poedit-Country: HUNGARY\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Fájlok gyűjtése..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Kihagyod?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "\"%s\" fájlinfó meghatározása sikertelen: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "\"%s\" jogainak cseréje sikertelen: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "\"%s\" tulajdonosának cseréje sikertelen: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "\"%s\" csoportjának cseréje sikertelen: %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "\"%s\" fájl már létezik. Üres fájllal cseréljük?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Nem törölhető: \"%s\".\n"
-"\n"
-"Ãtugrod?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Nem hozható létre az üres fájl: %s.\n"
-"\n"
-"Ãtugrod?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "A mappa olvasása sikertelen"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Ismeretlen hiba"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Nincs Exec mező megadva"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Nincs URL megadva"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Hibás .desktop fájl"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "A fájl elemzése meghiúsult"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Érvénytelen fájl név"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "\"%s\" elérése sikertelen: %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"FelülÃrod?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "\"%s\" törlése sikertelen: %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Nem sikerült az alkalmazás betöltése e fájlból: %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Parancs"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "A mime kezelÅ‘t indÃtó parancs"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Zászlók"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "A mime kezelő zászlói"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Ikon"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Fájlok kijelölése átnevezéshez"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "A mime kezelő ikonja"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "ElÅ‘készÃtés..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Név"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "\"%s\" jogainak cseréje sikertelen: %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "A mime kezelő neve"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "\"%s\" tulajdonosának cseréje sikertelen: %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "%s dokumentum"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "\"%s\" csoportjának cseréje sikertelen: %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Az alábbi könyvtár létrehozása nem sikerült: \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Az ösvény túl hosszú"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "Az URI túl hosszú"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Méret"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Előkép méret"
+msgid "The file \"%s\" already exists"
+msgstr "A \"%s\" fájl már létezik"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Könyvtárak törlése..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Nem hozható létre e fifo: \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Nem törölhető e könyvtár: \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "A gyökér könyvtár nem mozgatható"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "ElÅ‘készÃtés..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Nem tudom megnyitni \"%s\"-t olvasásra"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Érvénytelen ösvény"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Nem tudom megnyitni \"%s\"-t Ãrásra"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Ismeretlen felhasználó: \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "Nem tudok adatot Ãrni ide: \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Nem sikerült meghatározni a csatolási pontot ehhez: %s"
+msgid "Failed to remove \"%s\""
+msgstr "Nem törölhető: \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "A HAL démon nem elérhető: \"%s\""
+msgid "Failed to read data from \"%s\""
+msgstr "Nem tudok adatot olvasni innen: \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "%s másolata"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "lánc ehhez: %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "%s 2. másolata"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "2. lánc ehhez: %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "%s 3. másolata"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "3. lánc ehhez: %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%u. másolat ehhez: %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%u. lánc ehhez: %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Nem sikerült meghatározni a fájl infót ehhez: %s"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Nem hozható létre ez a könyvtár: \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Nem hozható létre e fifo: \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "A megnevezett csövek nem támogatottak"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Nem tudom megnyitni \"%s\"-t olvasásra"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Nem hozható létre jelképes lánc: \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "A \"%s\" fájl már létezik"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Nem tudom megnyitni \"%s\"-t Ãrásra"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "A szimlinkek nem támogatottak"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Nem tudok adatot olvasni innen: \"%s\""
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Fájlrendszer"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Nem sikerült átnevezni \"%s\"-t erre: \"%s\"."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Nem sikerült átnevezni \"%s\"-t erre: \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Nem sikerült átnevezni \"%s\"-t erre: \"%s\"."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "\"%s\" ösvény nem mappára hivatkozik"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Nem tudok adatot Ãrni ide: \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "Nem sikerült az alkalmazás betöltése e fájlból: %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Nem törölhető: \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "\"%s\" törlése sikertelen: %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Művelet törölve"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Parancs"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "A lánc céljának olvasása sikertelen: \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "A mime kezelÅ‘t indÃtó parancs"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Zászlók"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "A mime kezelő zászlói"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Ikon"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "A mime kezelő ikonja"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Név"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "A mime kezelő neve"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Nem hozható létre jelképes lánc: \"%s\""
+msgid "%s document"
+msgstr "%s dokumentum"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Nem módosÃthatók a jogok: \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "A szimlinkek nem támogatottak"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Az ösvény túl hosszú"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "Az URI túl hosszú"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Méret"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Előkép méret"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Fájlok gyűjtése..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Érvénytelen ösvény"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Nem sikerült meghatározni a fájl infót ehhez: %s"
+msgid "Unknown user \"%s\""
+msgstr "Ismeretlen felhasználó: \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Nem sikerült e speciális fájl másolása: \"%s\""
+msgid "Failed to determine the mount point for %s"
+msgstr "Nem sikerült meghatározni a csatolási pontot ehhez: %s"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "A HAL démon nem elérhető: \"%s\""
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -499,78 +457,163 @@ msgid "Sort items in descending order"
msgstr "Az elemeket csökkenően rendezi"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Nem sikerült a művelet indÃtása"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Nem sikerült megnyitni ezt: \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "\"%s\" megnyitása sikertelen: %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Fájlok másolása..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Jelképes láncok létrehozása..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Fájlok mozgatása..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Fájlok mozgatása..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Biztos vagy benne, hogy végleg\n"
+"törölni akarod?: \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] "Végleg törlöd a kijelölt %u fájlt?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Ha törölsz egy fájlt, végleg elvész."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Fájlok törlése..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Fájlok létrehozása..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Könyvtárak létrehozása..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Üres fájl"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Nem sikerült meghatározni a csatolási pontot ehhez: %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Új mappa létrehozása itt: \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Mappa létrehozása..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Nem törölhető: \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Fájlok törlése..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Nem sikerült beállÃtani az alapalkalmazást ehhez: \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Nincs kijelölt alkalmazás"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
msgstr "A kijelölt alkalmazás nyitja meg ezt és más \"%s\" tÃpusú fájlokat."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "Más alkalmazás..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Megnyitás ezzel:"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Egyéni parancs használata:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -579,40 +622,39 @@ msgstr ""
"alkalmazáshoz."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Böngészés..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Használd alapértelmezettként e fájltÃpushoz"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Nem sikerült az új alkalmazás hozzáadása: \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Sikertelen futtatás: \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "IndÃtó tö_rlése"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "<i>%s</i> és más \"%s\" tÃpusú fájlok megnyitása ezzel:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -620,8 +662,7 @@ msgstr ""
"Böngészd a fájlrendszert \"%s\" tÃpusú fájlokat megnyitó alkalmazás "
"kiválasztásához."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -630,12 +671,12 @@ msgstr ""
"Alapértelmezett alkalmazás váltása \"%s\" tÃpusú fájlokhoz a kijelölt "
"alkalmazásra."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Biztosan eltávolÃtod?: \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -649,39 +690,39 @@ msgstr ""
"Csak a fájlkezelő \"Megnyitás ezzel\" párbeszéde egyéni parancs gombjával "
"létrehozott indÃtók törölhetÅ‘k Ãgy."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Válassz alkalmazást"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Minden fájl"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Futtatható fájlok"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perl Szkriptek"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Python Szkriptek"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Ruby Szkriptek"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shell Szkriptek"
@@ -701,7 +742,7 @@ msgid "Other Applications"
msgstr "Más alkalmazások"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Nincs beillesztenivaló a vágólapon"
@@ -768,14 +809,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "Oszlopok nyújtása, ha szükséges"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Ismeretlen"
@@ -787,7 +829,7 @@ msgstr "Tömör könyvtár lista"
msgid "Compact view"
msgstr "Tömör nézet"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Új fájlnév megadása:"
@@ -813,16 +855,32 @@ msgstr "Részletes könyvtárlista"
msgid "Details view"
msgstr "Részletes nézet"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "fordÃtó-lista"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Nem sikerült megnyitni a dokumentáció böngészőt"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Igen"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "_Mind"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Nem"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Csendet!"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "Másolás ide"
@@ -877,7 +935,7 @@ msgstr "Tulajdonos"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Jogok"
@@ -893,14 +951,10 @@ msgstr "Fájl"
msgid "File Name"
msgstr "Fájlnév"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "A gyökérkönyvtárnak nincsenek szülei"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Fájlrendszer"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -935,14 +989,14 @@ msgstr "Ikonnézet"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Megnyit"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Megnyitás új ablakban"
@@ -1064,91 +1118,109 @@ msgid "Send the selected file to \"%s\""
msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Kijelölt fájlok küldése ide: \"%s\""
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "törött lánc"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
msgstr[0] "%d elem (%s), Szabad hely: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d elem, Szabad: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d elem"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" törött lánc"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) lánc ide: %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Kép méret:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d elem kijelölve (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d elem kijelölve"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Távolság"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Ösvénygombok közti táv"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "\"%s\" megnyitása itt"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "\"%s\" megnyitása új ablakban"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Új mappa létrehozása itt: \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Mappa létrehozása..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1156,29 +1228,29 @@ msgstr ""
"A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy "
"másolása ide: \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Mappába illesztés"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "\"%s\" könyvtár tulajdonságainak megtekintése"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "Tulajdonságok"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Új mappa"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Új mappa létrehozása"
@@ -1195,11 +1267,11 @@ msgstr "_Hely:"
msgid "Failed to launch \"%s\""
msgstr "Nem futtatható: \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Ikon méret"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Az ösvényelem ikonmérete"
@@ -1282,17 +1354,15 @@ msgid "Stop applying permissions recursively."
msgstr "Jogok rekurzÃv alkalmazásának leállÃtása."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Kérdés"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Legyen rekurzÃv?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
@@ -1300,11 +1370,11 @@ msgstr ""
"A változásokat a kijelölt mappában minden fájlra és\n"
"alkönyvtárra rekurzÃvan alkalmazzam?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Ne kérdezd ismét"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1314,29 +1384,29 @@ msgstr ""
"beállÃtások között módosÃthatod."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Nem sikerült csoportot váltani"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Nem sikerült új jogokat beállÃtani"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Ismeretlen fájl tulajdonos"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Könyvtár jogok automatikus javÃtása?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Könyvtár jogok javÃtása"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1345,86 +1415,66 @@ msgstr ""
"A könyvtár jogait ismét összefüggÅ‘re állÃtom. Csak e könyvtár tartalmát "
"olvasni jogosult felhasználók léphetnek majd bele."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Igen"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "_Mind"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Nem"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Csendet!"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Fájlkezelő tulajdonságok"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Nézetek"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Alapnézet"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Új könyvtárak megtekintése ezzel:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Ikonnézet"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Részletes nézet"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Tömör lista nézet"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Utolsó aktÃv nézet"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Előbb a mappák"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Ha ezt választod, egy mappa rendezésekor a mappák a fájlok elé kerülnek."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Előképek mutatá_sa"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
msgstr "E lehetőség az előnézhető fájlokat előképi ikonokként mutatja."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "Szöveg az ikonok mellett"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1433,58 +1483,58 @@ msgstr "A feliratok az ikon mellé kerüljenek, ne alá."
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Oldalpanel"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Könyvjelző panel"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_Ikon méret:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Apró"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Kisebb"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Kicsi"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normál"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Nagy"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Nagyobb"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Óriási"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Ikon j_elképek mutatása"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1492,19 +1542,19 @@ msgstr ""
"E lehetőség minden, a mappa tulajdonságok közt megadott mappa ikon jelképet "
"megjelenÃti a könyvjelzÅ‘ panelon."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Fa panel"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Ikon méret:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Ikon jelképek _mutatása"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1515,16 +1565,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Viselkedés"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "_Sima katt az indÃtáshoz"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1532,7 +1585,7 @@ msgstr ""
"Add meg egy elem kijelölésének késl_eltetését\n"
"mikor ráviszed az egeret:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1545,34 +1598,34 @@ msgstr ""
"viselkedés kikapcsolható a csúszka balra húzásával. Ez hasznos egy-kattintós "
"módban, ha csak kijelölni akarod az elemet indÃtása nélkül."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Kikapcsolva"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Közepes"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Hosszú"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Dupla katt az indÃtáshoz"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Haladó"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Mappa jogok"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1582,177 +1635,182 @@ msgstr ""
"a tartalmára is alkalmazhatod azt.\n"
"Válaszd ki az alapértelmezett viselkedést:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Mindig kérdez"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Csak a könyvtárra"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "A könyvtárra és tartalmára"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu óra van hátra)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu perc van hátra)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(%lu mp. van hátra)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Ãltalános"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Név"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "TÃpus:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Megnyitás ezzel:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Lánc ide:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "Törlése"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "MódosÃtva:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Megnyitva:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Méret:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Kötet:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Szabad hely:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Jelkép"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Tulajdonságok"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Nem átnevezhető: \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Fájl"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "Küldé_s ide"
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Helyi fájl menü"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "Fájlok hozzá_adása..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Új fájlok adása az átnevezendő fájlok listájához"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "ÃœrÃt"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "KiürÃti az alábbi fájl listát"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Névjegy"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Információkat nyújt a Thunar csoportos átnevezésről"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "Tulajdonságok..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "A kijelölt fájl tulajdonságainak megtekintése"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Több fájl átnevezése"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "Fájlok átnevezése"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "Kattints ide a fent listázott fájlok átnevezéséhez most az új nevükre."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Új név"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr "Kattints ide a kijelölt átnevezési művelet leÃrásához."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1760,30 +1818,30 @@ msgid ""
msgstr ""
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Fájlok kijelölése átnevezéshez"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Hang fájlok"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Képfájlok"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Mozgóképek"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Csoportos átnevezés"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1791,18 +1849,18 @@ msgstr ""
"A Thunar csoportos átnevezés egy erÅ‘s és bÅ‘vÃthetÅ‘\n"
"eszköz több fájl egyidejű átnevezéséhez."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Fájlok törlése"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Kijelölt fájlok törlése az átnevezendő fájlok listájából"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Csoportos átnevezés - több fájl átnevezése"
@@ -1845,119 +1903,119 @@ msgid_plural "Add the selected folders to the shortcuts side pane"
msgstr[0] "Kijelölt mappák hozzáadása a könyvjelzők panelhoz"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "Kötet felcsatolása"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "Lemez kiadása"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "Kötet lecsatolása"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "Gyrosmappa törlé_se"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Gyorsmappa át_nevezése"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "\"%s\" ösvény nem mappára hivatkozik"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "A könyvjelző hozzáadása sikertelen"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Nem lehet kiadni: \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Nem csatolható: \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Nem leválasztható: \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Kattints ide a mappa mérete számolásának leállÃtásához."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Számolás törölve"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Számolás..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s bájt"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u elem, összesen %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Helyi mappa menü"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Üres mappa létrehozása e mappán belül"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "Vágás"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "Másolás"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "Beillesztés"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy "
"másolása"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "Törlése"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -1965,146 +2023,136 @@ msgstr ""
"A Vágás vagy Másolás paranccsal legutóbb kijelölt fájlok mozgatása vagy "
"másolása a kijelölt mappába"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Minden fájl kijelölése"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Minden fájlt kiválaszt ebből az ablakból"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Kijelölés mintával"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Egy adott mintára illő valamennyi fájl kiválasztása"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Kettőzés"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Lánc _készÃtése"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "Ãtnevezés..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "A kijelölt fájl átnevezése"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "_Dokumentum létrehozása"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Mappa beolvasása..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Új üres fájl"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Új üres fájl..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Dokumentum létrehozása e sablonból: \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Biztos vagy benne, hogy végleg\n"
-"törölni akarod?: \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] "Végleg törlöd a kijelölt %u fájlt?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Ha törölsz egy fájlt, végleg elvész."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Kijelölés mintával"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "Kijelöl"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "Minta:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "\"%s\" átnevezése"
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "Rossz fájlnevet adott az XDS húzó helyzet"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Nem hozható létre egy lánc ehhez az URL-hez: \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Nem megnyitható könyvtár: \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] ""
"ElÅ‘készÃti a kijelölt fájlt a Beillesztés paranccsal való mozgatáshoz"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "Kijelölt fájlok elÅ‘készÃtése a Beillesztés parancshoz"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Kijelölt fájl végleges törlése"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Kijelölt fájl megkettőzése"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Kijelölt fájl megkettőzése"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Jelképes lánc készÃtése a kijelölt fájlokhoz"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "A kijelölt fájl átnevezése"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "A kijelölt fájl átnevezése"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Létrehoz"
@@ -2123,20 +2171,30 @@ msgstr "Nincsenek telepÃtett sablonok"
msgid "_Empty File"
msgstr "Üres fájl"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Betöltés..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "Ma_ppába illesztés"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "Tulajdonságok..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Új _Ablak"
@@ -2558,23 +2616,23 @@ msgid "Shutter Speed:"
msgstr "Zár sebesség:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Szoftver:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Kép"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Kép tÃpus:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Kép méret:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2747,21 +2805,21 @@ msgstr "Érvénytelen szabályos kifejezés e karakternél: %ld: %s"
msgid "Search & Replace"
msgstr "Keresés és csere"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "\"%s\"-t tömörÃtett archÃvumként küldöd?"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "Közvetlen küld"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "TömörÃtve küld"
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
@@ -2770,17 +2828,17 @@ msgstr ""
"Fájl email-ben küldésekor, küldheted közvetlenül vagy tömörÃtve. A nagy "
"fájlokat nagyon ajánlott tömörÃteni küldés elÅ‘tt."
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] "%d fájlt tömörÃtett archÃvumként küldesz?"
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "_ArchÃvumként küld"
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2793,35 +2851,35 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "Fájlok tömörÃtése..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "A ZIP parancs %d hibával leállt"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr "Az átmeneti könyvtár nem hozható létre"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Nem hozható létre jelképes lánc ehhez: \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
msgstr[0] "%d fájl tömörÃtése meghiúsult"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "Email Ãrása meghiúsult"
@@ -2829,6 +2887,33 @@ msgstr "Email Ãrása meghiúsult"
msgid "Mail Recipient"
msgstr "CÃmzett"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "A HAL démon nem elérhető: \"%s\""
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Egyéni műveletek"
@@ -3061,11 +3146,11 @@ msgstr ""
msgid "Unknown closing element <%s>"
msgstr "Ismeretlen <%s> lezáró elem"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Nem sikerült meghatározni az uca.xml helyét"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "A parancs nincs beállÃtva"
@@ -3114,3 +3199,85 @@ msgstr "Mappa megnyitása a Thunar-ral"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Kijelölt mappák megnyitása a Thunar-ban"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Kijelölt fájl végleges törlése"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "\"%s\" jogainak cseréje sikertelen: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Kihagyod?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "\"%s\" fájlinfó meghatározása sikertelen: %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "\"%s\" fájl már létezik. Üres fájllal cseréljük?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Nem törölhető: \"%s\".\n"
+#~ "\n"
+#~ "Ãtugrod?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Nem hozható létre az üres fájl: %s.\n"
+#~ "\n"
+#~ "Ãtugrod?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "\"%s\" elérése sikertelen: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "FelülÃrod?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Az alábbi könyvtár létrehozása nem sikerült: \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Könyvtárak törlése..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Nem törölhető e könyvtár: \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "A gyökér könyvtár nem mozgatható"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "A megnevezett csövek nem támogatottak"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Művelet törölve"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "A lánc céljának olvasása sikertelen: \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Nem módosÃthatók a jogok: \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Nem sikerült e speciális fájl másolása: \"%s\""
diff --git a/po/it.po b/po/it.po
index 2e8f22c52d408cd5edaba67678279802e09373ce..c7c71687ee98c6ea2fb07229ebf5b3b9d62027e7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-06-14 22:39+0100\n"
"Last-Translator: Roberto Pariset <r.pariset@gmail.com>\n"
"Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -19,373 +19,331 @@ msgstr ""
"X-Poedit-Country: ITALY\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Raccolta file in corso..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s. \n"
-"\n"
-"Si desidera saltarlo?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Impossibile reperire informazioni del file \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Impossibile cambiare permessi di \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Impossibile cambiare proprietario del file \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Impossibile cambiare gruppo del file \"%s\": %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Il file \"%s\" esiste già . Si desidera rimpiazzarlo con un file vuoto?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Impossibile eliminare \"%s\".\n"
-"\n"
-"Si desidera saltarlo?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Impossibile eliminare \"%s\".\n"
-"\n"
-"Si desidera saltarlo?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Impossibile leggere i contenuti della directory"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Errore sconosciuto"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Campo Exec non specificato"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Campo URL non specificato"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Desktop file non valido"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Impossibile fare il parsing del file"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Nome del file non valido"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Stat del file \"%s\" fallito: %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Si desidera sovrascrivere?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Impossibile rimuovere \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Impossibile caricare l'applicazione dal file %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Comando"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "Il comando per eseguire il gestore mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Flag"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "I flag per il gestore mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Icona"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Selezionare file da rinominare"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "L'icona del gestore mime"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "In preparazione..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nome"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Impossibile cambiare permessi di \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Il nome del gestore mime"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Impossibile cambiare proprietario del file \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "Documento %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Impossibile cambiare gruppo del file \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Impossibile creare la directory \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Path troppo lunga per entrare nel buffer"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI troppo lunga per entrare nel buffer"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Dimensione"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Dimensione desiderata della miniatura"
+msgid "The file \"%s\" already exists"
+msgstr "Il file \"%s\" esiste già "
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Eliminazione delle directory in corso..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Impossibile creare pipe con nome \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Impossibile rimuovere la directory \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Impossibile trasferire la directory radice"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "In preparazione..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Impossibile aprire \"%s\" in lettura"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Path non valida"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Impossibile aprire \"%s\" in scrittura"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Utente \"%s\" sconosciuto"
+msgid "Failed to write data to \"%s\""
+msgstr "Impossibile scrivere dati su \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Impossibile determinare il mount point di `%s'"
+msgid "Failed to remove \"%s\""
+msgstr "Impossibile rimuovere \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Impossibile connettersi al demone di HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Impossibile leggere dati da \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "copia di %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "link a %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "un'altra copia di %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "un altro link a %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "terza copia di %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "terzo link a %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%u° copia di %s"
msgstr[1] "%u° copia di %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%u° link a %s"
msgstr[1] "%u° link a %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Impossibile reperire informazioni per il file \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Impossibile creare la directory \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Impossibile creare pipe con nome \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Le pipe con nome non sono supportate"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Impossibile aprire \"%s\" in lettura"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Impossibile creare link simbolico \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Il file \"%s\" esiste già "
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Impossibile aprire \"%s\" in scrittura"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "I link simbolici non sono supportati"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Impossibile leggere dati da \"%s\""
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Filesystem"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Impossibile rinominare \"%s\" in \"%s\"."
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Impossibile rinominare \"%s\" in \"%s\"."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Impossibile rinominare \"%s\" in \"%s\"."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "La path \"%s\" non si riferisce ad una directory"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Impossibile scrivere dati su \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "Impossibile caricare l'applicazione dal file %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Impossibile rimuovere \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "Impossibile rimuovere \"%s\": %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Operazione annullata"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Comando"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Impossibile leggere la destinazione del link \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "Il comando per eseguire il gestore mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Flag"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "I flag per il gestore mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Icona"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "L'icona del gestore mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nome"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Il nome del gestore mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Impossibile creare link simbolico \"%s\""
+msgid "%s document"
+msgstr "Documento %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Impossibile cambiare modalità di \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "I link simbolici non sono supportati"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Path troppo lunga per entrare nel buffer"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI troppo lunga per entrare nel buffer"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Dimensione"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Dimensione desiderata della miniatura"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Raccolta file in corso..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Path non valida"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Impossibile reperire informazioni per il file \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "Utente \"%s\" sconosciuto"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Impossibile copiare il file speciale \"%s\""
+msgid "Failed to determine the mount point for %s"
+msgstr "Impossibile determinare il mount point di `%s'"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Impossibile connettersi al demone di HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -502,58 +460,148 @@ msgid "Sort items in descending order"
msgstr "Ordina gli elementi in ordine discendente"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Impossibile lanciare l'operazione"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Impossibile aprire \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Impossibile aprire \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Copia dei file in corso..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Creazione dei link simbolici in corso..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Spostamento dei file in corso..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Spostamento dei file in corso..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Sei sicuro di voler eliminare\n"
+"permanentemente \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Sei sicuro di voler eliminare\n"
+"permanentemente il file selezionato?"
+msgstr[1] ""
+"Sei sicuro di voler eliminare\n"
+"permanentemente i %u file selezionati?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Se si cancella un file, questo è perso per sempre."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Eliminazione dei file in corso..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Creazione dei file in corso..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Creazione directory in corso..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "File _vuoto"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Impossibile determinare il mount point di `%s'"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Crea nuova directory in \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Crea _directory..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Impossibile rimuovere \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Eliminazione dei file in corso..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Impossibile impostare l'applicazione di default per \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Nessuna applicazione selezionata"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -562,20 +610,20 @@ msgstr ""
"tipo \"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Altra applicazione..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Apri con"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Usa un _comando personalizzato:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -584,40 +632,39 @@ msgstr ""
"lista precedente."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Sfoglia..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Usa come _predefinita per questo tipo di file"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Impossibile aggiungere una nuova applicazione \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Impossibile eseguire \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "_Rimuovi launcher dell'applicazione"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Aprire <i>%s</i> e altri file di tipo \"%s\" con:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -625,8 +672,7 @@ msgstr ""
"Esplora il file system per selezionare un'applicazione che apra file di tipo "
"\"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -635,12 +681,12 @@ msgstr ""
"Cambia l'applicazione di default per i file di tipo \"%s\" con "
"l'applicazione selezionata."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Sei sicuro di voler eliminare \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -654,39 +700,39 @@ msgstr ""
"È possibile rimuovere solo i launcher che sono stati creati usando l'opzione "
"Comando Personalizzato nella finestra \"Apri con\" del file manager."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Selezionare un'applicazione"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Tutti i file"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "File eseguibili"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Script Perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Script Python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Script Ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Script Shell"
@@ -706,7 +752,7 @@ msgid "Other Applications"
msgstr "Altre applicazioni"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Nella clipboard non c'è niente da incollare"
@@ -774,14 +820,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "_Espandi automaticamente le colonne quando necessario"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Sconosciuto"
@@ -793,7 +840,7 @@ msgstr "Elenco delle directory compatto"
msgid "Compact view"
msgstr "Visualizzazione compatta"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Inserire il nuovo nome:"
@@ -819,16 +866,32 @@ msgstr "Lista dettagliata delle directory"
msgid "Details view"
msgstr "Visualizzazione dettagliata"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "Roberto Pariset <r.pariset@gmail.com>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Impossibile aprire il browser della documentazione"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Sì"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Sì _a tutti"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_No"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Cancella"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Copia qui"
@@ -883,7 +946,7 @@ msgstr "Proprietario"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Permessi"
@@ -899,14 +962,10 @@ msgstr "File"
msgid "File Name"
msgstr "Nome del file"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "La directory radice non ha padre"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Filesystem"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -942,14 +1001,14 @@ msgstr "Visualizzazione a icone"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Apri"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Apri in una nuova finestra"
@@ -1083,12 +1142,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Invia il file selezionato a \"%s\""
msgstr[1] "Invia i file selezionati a \"%s\""
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "link rotto"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1096,83 +1155,101 @@ msgstr[0] "Elemento %d (%s), spazio libero: %s"
msgstr[1] "Elementi %d (%s), spazio libero: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d elemento, spazio libero %s"
msgstr[1] "%d elementi, spazio libero %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d elemento"
msgstr[1] "%d elementi"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" link rotto"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) punta a %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Dimensione dell'immagine:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d elemento selezionato (%s)"
msgstr[1] "%d elementi selezionati (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d elemento selezionato"
msgstr[1] "%d elementi selezionati"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Separatore"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Quantità di spazio tra i bottoni della path"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Apri \"%s\" in questa finestra"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Apri \"%s\" in una nuova finestra"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Crea nuova directory in \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Crea _directory..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1180,29 +1257,29 @@ msgstr ""
"Sposta o Copia i file selezionati precedentemente da un comando di Taglia o "
"Copia dentro \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Incolla dentro la directory"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Visualizza le proprietà della directory \"%s\""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Proprietà "
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Nuova directory"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Crea nuova directory"
@@ -1219,11 +1296,11 @@ msgstr "_Percorso:"
msgid "Failed to launch \"%s\""
msgstr "Impossibile lanciare \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Dimensione dell'icona"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "La dimensione dell'icona del percorso"
@@ -1306,17 +1383,15 @@ msgid "Stop applying permissions recursively."
msgstr "Interrompi l'applicazione ricorsiva dei permessi."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Domanda"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Applicare ricorsivamente?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
@@ -1324,11 +1399,11 @@ msgstr ""
"Si desidera applicare i cambiamenti ricorsivamente a\n"
"tutti i file e sottodirectory sotto la directory selezionata?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Non chiedermelo più"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1338,29 +1413,29 @@ msgstr ""
"riproposta. In futuro sarà possibile modificare la scelta tra le Preferenze."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Impossibile cambiare gruppo"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Impossibile applicare i nuovi permessi"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Proprietario del file sconosciuto"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Correggere i permessi della directory automaticamente?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Correzione dei premessi della directory"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1370,77 +1445,57 @@ msgstr ""
"seguito, solo agli utenti con permesso di lettura per questa directory sarà "
"concesso di accedervi."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Sì"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Sì _a tutti"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_No"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Cancella"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Preferenze del File Manager"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Visualizzazioni"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Visualizzazione di default"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Visualizza _nuove directory usando:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Visualizzazione a icone"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Visualizzazione dettagliata"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Visualizza come lista compatta"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Ultima visualizzazione attiva"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Mostra le directory _prima dei file"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Selezionare questa opzione per elencare le directory prima dei file quando "
"una directory viene ordinata."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Mostra _miniature"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1448,11 +1503,11 @@ msgstr ""
"Selezionare questa opzione per visualizzare le anteprime dei file dentro una "
"directory come miniature generate automaticamente."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Testo accanto alle icone"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1463,58 +1518,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Pannello laterale"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Pannello delle scorciatoie"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_Dimensione delle icone"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Molto piccola"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Più piccola"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Piccola"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normale"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Grande"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Più grande"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Molto grande"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Visualizza gli _emblemi delle icone"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1523,19 +1578,19 @@ msgstr ""
"pannello delle scorciatoie per tutte le directory per cui sono stati "
"definiti emblemi nella relativa finestra delle proprietà ."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Pannello ad albero"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Dim_ensione delle icone"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Visualizza gli e_mblemi delle icone"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1547,16 +1602,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Comportamento"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "Clic _singolo per attivare gli elementi"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1564,7 +1622,7 @@ msgstr ""
"Specificare il te_mpo necessario affinché un elemento venga\n"
"selezionato quando il puntatore del mouse è fermo sopra di esso:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1579,34 +1637,34 @@ msgstr ""
"quando singoli clic attivano elementi, e si desidera solamente selezionare "
"un elemento, senza attivarlo."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Disabilitato"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Medio"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Lungo"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Doppio clic per attivare gli elementi"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Avanzate"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Permessi della directory"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1616,173 +1674,178 @@ msgstr ""
"è possibile applicare i cambiamenti anche ai suoi\n"
"contenuti. Selezionare il comportamento predefinito:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Chiedi ogni volta"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Applica solo alla directory"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Applica a directory e contenuti"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu ora rimanente)"
msgstr[1] "(%lu ore rimanenti)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu minuto rimanente)"
msgstr[1] "(%lu minuti rimanenti)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(%lu secondo rimanente)"
msgstr[1] "(%lu secondi rimanenti)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Generale"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Nome:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Tipo:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Apri con:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "File linkato:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Elimina"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Modificato:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Acceduto:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Dimensione:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Volume:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Spazio libero:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Emblemi"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Proprietà "
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Impossibile rinominare \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_File"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "_Invia a"
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Menu contestuale del file"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "Aggi_ungi file..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Inserisce ulteriori file nella lista di file da rinominare"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Pulisci"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Pulisce la lista di file sottostante"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Informazioni su..."
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Mostra informazioni sul Bulk Rename di Thunar"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Proprietà ..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Visualizza le proprietà dell'elemento selezionato"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Rinomina più file"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Rinomina file"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "Fare un clic qui per rinominare i file elencati sopra."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Nuovo nome"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
"Fare un clic qui per vedere la documentazione relativa all'operazione di "
@@ -1791,7 +1854,7 @@ msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1804,30 +1867,30 @@ msgstr ""
"Renamers\"."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Selezionare file da rinominare"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "File audio"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "File di Immagine"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "File video"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Bulk Rename"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1835,20 +1898,20 @@ msgstr ""
"Il Bulk Rename di Thunar è uno strumento potente ed\n"
"estendibile per rinominare più file contemporaneamente."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Rimuovi file"
msgstr[1] "Rimuovi file"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Rimuove il file selezionato dalla lista di file da rinominare"
msgstr[1] "Rimuove i file selezionati dalla lista di file da rinominare"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Bulk Rename - Rinomina molteplici file"
@@ -1898,122 +1961,122 @@ msgstr[1] ""
"Aggiungi le directory selezionata al pannello laterale delle scorciatoie"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Monta volume"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "Rimuovi _volume"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_Smonta volume"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_Rimuovi scorciatoia"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Ri_nomina scorciatoia"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "La path \"%s\" non si riferisce ad una directory"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Impossibile aggiungere nuova scorciatoia"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Impossibile espellere \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Impossibile montare \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Impossibile smontare \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr ""
"Fare un clic qui per interrompere il calcolo della dimensione della "
"directory."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Calcolo annullato"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Calcolo in corso..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s Byte"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u elemento da %s"
msgstr[1] "%u elementi da %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Menu contestuale della directory"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Crea una directory vuota dentro la directory corrente"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "_Taglia"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Copia"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "_Incolla"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Sposta o Copia i file selezionati precedentemente da un comando di Taglia o "
"Copia"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Elimina"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2021,127 +2084,99 @@ msgstr ""
"Sposta o Copia i file selezionati precedentemente da un comando di Taglia o "
"Copia dentro la directory selezionata"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Selezion_a tutti"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Seleziona tutti i file in questa finestra"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Seleziona in _base ad un pattern..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Seleziona tutti i file che corrispondono a un certo pattern"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Du_plica"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Crea _link"
msgstr[1] "Crea _link"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Rinomina..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Rinomina il file selezionato"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Crea d_ocumento"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Caricamento dei contenuti della cartella in corso..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Nuovo file vuoto"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Nuovo file vuoto..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Crea documento dal template \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Sei sicuro di voler eliminare\n"
-"permanentemente \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Sei sicuro di voler eliminare\n"
-"permanentemente il file selezionato?"
-msgstr[1] ""
-"Sei sicuro di voler eliminare\n"
-"permanentemente i %u file selezionati?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Se si cancella un file, questo è perso per sempre."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Seleziona in base ad un pattern"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Seleziona"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Pattern:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Rinomina \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "Nome del file fornito dalla sorgente XDS non valido"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Impossibile creare un link per l'URL \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Impossibile aprire la directory \"%s\"."
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] ""
@@ -2149,31 +2184,46 @@ msgstr[0] ""
msgstr[1] ""
"Prepara i file selezionati ad essere spostati con il comando Incolla"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] ""
"Prepara il file selezionato ad essere copiato con il comando Incolla"
msgstr[1] "Prepara i file selezionati ad essere copiati con il comando Incolla"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Elimina l'elemento selezionato permanentemente"
-msgstr[1] "Elimina gli elementi selezionati permanentemente"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Duplica il file selezionato"
+msgstr[1] "Duplica i file selezionati"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Duplica il file selezionato"
msgstr[1] "Duplica i file selezionati"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Crea un link simbolico per il file selezionato"
msgstr[1] "Crea un link simbolico per i file selezionati"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Rinomina il file selezionato"
+msgstr[1] "Rinomina il file selezionato"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Rinomina il file selezionato"
+msgstr[1] "Rinomina il file selezionato"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Crea"
@@ -2192,20 +2242,30 @@ msgstr "Nessun template installato"
msgid "_Empty File"
msgstr "File _vuoto"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Caricamento in corso..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "_Incolla nella directory"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "_Proprietà ..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Apri nuova _finestra"
@@ -2639,23 +2699,23 @@ msgid "Shutter Speed:"
msgstr "Velocità otturatore:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Software:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Immagine"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Tipo di immagine:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Dimensione dell'immagine:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2829,21 +2889,21 @@ msgstr "Espressione regolare non valida nel carattere in posizione %ld: %s"
msgid "Search & Replace"
msgstr "Cerca e sostituisci"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "Inviare \"%s\" come un archivio compresso?"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "Invia _direttamente"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "Invia com_presso"
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
@@ -2854,18 +2914,18 @@ msgstr ""
"all'email. È caldamente raccomandato di comprimere file grandi prima di "
"inviarli."
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] "Inviare %d file come archivio compresso?"
msgstr[1] "Inviare %d file come archivio compresso?"
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "Invia come _archivio"
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2879,28 +2939,28 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "Compressione dei file in corso..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "Programma di compressione terminato con errore %d"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr "Impossibile creare la directory temporanea"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Impossibile creare link simbolico per \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2908,7 +2968,7 @@ msgstr[0] "Impossibile comprimere %d file"
msgstr[1] "Impossibile comprimere %d file"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "Impossibile comporre una nuova email"
@@ -2916,6 +2976,33 @@ msgstr "Impossibile comporre una nuova email"
msgid "Mail Recipient"
msgstr "Destinatario"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Impossibile connettersi al demone di HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Azioni personalizzate"
@@ -3156,11 +3243,11 @@ msgstr "Errore nel parsing del file uca.xml"
msgid "Unknown closing element <%s>"
msgstr "Elemento di chiusura sconosciuto <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Impossibile determinare il percorso di salvataggio per uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Comando non configurato"
@@ -3211,3 +3298,87 @@ msgstr "Apri directory con Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Apri le directory specificate con Thunar"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Elimina l'elemento selezionato permanentemente"
+#~ msgstr[1] "Elimina gli elementi selezionati permanentemente"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Impossibile cambiare permessi di \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s. \n"
+#~ "\n"
+#~ "Si desidera saltarlo?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Impossibile reperire informazioni del file \"%s\": %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "Il file \"%s\" esiste già . Si desidera rimpiazzarlo con un file vuoto?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Impossibile eliminare \"%s\".\n"
+#~ "\n"
+#~ "Si desidera saltarlo?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Impossibile eliminare \"%s\".\n"
+#~ "\n"
+#~ "Si desidera saltarlo?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Stat del file \"%s\" fallito: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Si desidera sovrascrivere?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Impossibile creare la directory \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Eliminazione delle directory in corso..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Impossibile rimuovere la directory \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Impossibile trasferire la directory radice"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Le pipe con nome non sono supportate"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Operazione annullata"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Impossibile leggere la destinazione del link \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Impossibile cambiare modalità di \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Impossibile copiare il file speciale \"%s\""
diff --git a/po/ja.po b/po/ja.po
index 8366d3d5e0744ba747263360e449a03e5eeb2102..1e92d6151afb9aef04748d54adf61e7ec69d972d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-06-13 04:11+0900\n"
"Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
"Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -25,209 +25,304 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "ファイルを集ã‚ã¦ã„ã¾ã™..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s。\n"
-"\n"
-"ã“れを飛ã°ã—ã¾ã™ã‹ï¼Ÿ"
-
-# FIXME: stat?
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "「%sã€ã®ãƒ•ã‚¡ã‚¤ãƒ«æƒ…å ±ã‚’å–å¾—ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "「%sã€ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚’変更ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "「%sã€ã®æ‰€æœ‰è€…を変更ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "「%sã€ã®æ‰€å±žã‚°ãƒ«ãƒ¼ãƒ—を変更ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr ""
-"ファイル「%sã€ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚ã“れを空ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ç½®ãæ›ãˆã¦ã‚‚よã‚ã—ã„ã§ã™"
-"ã‹ï¼Ÿ"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"「%sã€ã‚’削除ã§ãã¾ã›ã‚“。\n"
-"\n"
-"ã“れを飛ã°ã—ã¾ã™ã‹ï¼Ÿ"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"空ã®ãƒ•ã‚¡ã‚¤ãƒ«ã€Œ%sã€ã‚’作æˆã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n"
-"\n"
-"ã“れを飛ã°ã—ã¾ã™ã‹ï¼Ÿ"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "フォルダã®å†…容をèªã¿è¾¼ã‚€ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "åŽŸå› ä¸æ˜Žã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "デスクトップファイルã®ã€ŒExecã€ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "デスクトップファイルã®ã€ŒURLã€ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "無効ãªãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ファイルã§ã™ã€‚"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "ファイルを解æžã§ãã¾ã›ã‚“。"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "無効ãªãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã€‚"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "åå‰å¤‰æ›´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¦ãã ã•ã„"
+
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "準備ã—ã¦ã„ã¾ã™..."
+
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "「%sã€ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚’変更ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "「%sã€ã®æ‰€æœ‰è€…を変更ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "「%sã€ã®æ‰€å±žã‚°ãƒ«ãƒ¼ãƒ—を変更ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "ファイル「%sã€ã®çŠ¶æ…‹ã‚’å–å¾—ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+msgid "The file \"%s\" already exists"
+msgstr "ファイル「%sã€ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚"
+
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "åå‰ã¤ãパイプ「%sã€ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s。\n"
-"\n"
-"上書ãã—ã¾ã™ã‹ï¼Ÿ"
+msgid "Failed to open \"%s\" for reading"
+msgstr "èªã¿è¾¼ã‚€ãŸã‚ã«ã€Œ%sã€ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "「%sã€ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+msgid "Failed to open \"%s\" for writing"
+msgstr "書ã込むãŸã‚ã«ã€Œ%sã€ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
+#, c-format
+msgid "Failed to write data to \"%s\""
+msgstr "「%sã€ã¸ãƒ‡ãƒ¼ã‚¿ã‚’書ã込むã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
+#, c-format
+msgid "Failed to remove \"%s\""
+msgstr "「%sã€ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
+#, c-format
+msgid "Failed to read data from \"%s\""
+msgstr "「%sã€ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã‚’èªã¿è¾¼ã‚€ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
+#, c-format
+msgid "copy of %s"
+msgstr "%s ã®ã‚³ãƒ”ー"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
+#, c-format
+msgid "link to %s"
+msgstr "%s ã¸ã®ãƒªãƒ³ã‚¯"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
+#, c-format
+msgid "another copy of %s"
+msgstr "%s ã®åˆ¥ã®ã‚³ãƒ”ー"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
+#, c-format
+msgid "another link to %s"
+msgstr "%s ã¸ã®åˆ¥ã®ãƒªãƒ³ã‚¯"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
+#, c-format
+msgid "third copy of %s"
+msgstr "%s ã® 3 番目ã®ã‚³ãƒ”ー"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
+#, c-format
+msgid "third link to %s"
+msgstr "%s ã¸ã® 3 番目ã®ãƒªãƒ³ã‚¯"
+
+#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
+#, c-format
+msgid "%uth copy of %s"
+msgid_plural "%uth copy of %s"
+msgstr[0] "%2$s ã® %1$u 番目ã®ã‚³ãƒ”ー"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
+#, c-format
+msgid "%uth link to %s"
+msgid_plural "%uth link to %s"
+msgstr[0] "%2$s ã¸ã® %1$u 番目ã®ãƒªãƒ³ã‚¯"
+
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "「%sã€ã®ãƒ•ã‚¡ã‚¤ãƒ«æƒ…å ±ã‚’ç¢ºå®šã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
+#, c-format
+msgid "Failed to create directory \"%s\""
+msgstr "フォルダ「%sã€ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
+#, c-format
+msgid "Failed to create named fifo \"%s\""
+msgstr "åå‰ã¤ãパイプ「%sã€ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
+#, c-format
+msgid "Failed to create symbolic link \"%s\""
+msgstr "リンク「%sã€ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "シンボリックリンクãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。"
+
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "ファイルシステム"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "「%sã€ã®åå‰ã‚’「%sã€ã«å¤‰æ›´ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "「%sã€ã®åå‰ã‚’「%sã€ã«å¤‰æ›´ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "「%sã€ã®åå‰ã‚’「%sã€ã«å¤‰æ›´ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "パス「%sã€ã¯ãƒ•ã‚©ãƒ«ãƒ€ã‚’å‚ç…§ã—ã¦ã„ã¾ã›ã‚“。"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
msgid "Failed to load application from file %s"
msgstr "ファイル「%sã€ã‹ã‚‰ã‚¢ãƒ—リケーションをèªã¿è¾¼ã‚€ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
+#, c-format
+msgid "Failed to remove \"%s\": %s"
+msgstr "「%sã€ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+
# NOTE: GObject property
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
msgid "Command"
msgstr "コマンド"
# NOTE: GObject property
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
msgid "The command to run the mime handler"
msgstr "MIMEãƒãƒ³ãƒ‰ãƒ©ãƒ¼ã‚’実行ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚"
# NOTE: GObject property
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
msgid "Flags"
msgstr "フラッグ"
# NOTE: GObject property
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
msgid "The flags for the mime handler"
msgstr "MIMEãƒãƒ³ãƒ‰ãƒ©ãƒ¼ã®ãƒ•ãƒ©ãƒƒã‚°ã§ã™ã€‚"
# NOTE: GObject property
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
msgid "Icon"
msgstr "アイコン"
# NOTE: GObject property
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
msgid "The icon of the mime handler"
msgstr "MIMEãƒãƒ³ãƒ‰ãƒ©ãƒ¼ã®ã‚¢ã‚¤ã‚³ãƒ³ã§ã™ã€‚"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
#: ../thunarx/thunarx-renamer.c:177
msgid "Name"
msgstr "åå‰"
# NOTE: GObject property
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
msgid "The name of the mime handler"
msgstr "MIMEãƒãƒ³ãƒ‰ãƒ©ãƒ¼ã®åå‰ã§ã™ã€‚"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
msgid "%s document"
msgstr "%s 文書"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "フォルダ「%sã€ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-path.c:684
+#: ../thunar-vfs/thunar-vfs-path.c:835
msgid "Path too long to fit into buffer"
msgstr "ãƒãƒƒãƒ•ã‚¡ã«æ ¼ç´ã™ã‚‹ã«ã¯ãƒ‘スãŒé•·ã™ãŽã¾ã™ã€‚"
-#: ../thunar-vfs/thunar-vfs-path.c:787
+#: ../thunar-vfs/thunar-vfs-path.c:938
msgid "URI too long to fit into buffer"
msgstr "ãƒãƒƒãƒ•ã‚¡ã«æ ¼ç´ã™ã‚‹ã«ã¯ URI ãŒé•·ã™ãŽã¾ã™ã€‚"
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
msgid "Size"
msgstr "サイズ"
@@ -237,26 +332,12 @@ msgstr "サイズ"
msgid "The desired thumbnail size"
msgstr "ãŠæœ›ã¿ã®ã‚µãƒ ãƒã‚¤ãƒ«ã‚µã‚¤ã‚ºã§ã™ã€‚"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "フォルダを削除ã—ã¦ã„ã¾ã™..."
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
-#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "フォルダ「%sã€ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "ルートフォルダを転é€ã§ãã¾ã›ã‚“。"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "準備ã—ã¦ã„ã¾ã™..."
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "ファイルを集ã‚ã¦ã„ã¾ã™..."
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
+#: ../thunar-vfs/thunar-vfs-util.c:251
msgid "Invalid path"
msgstr "無効ãªãƒ‘スã§ã™ã€‚"
@@ -276,132 +357,6 @@ msgstr "「%sã€ã®ãƒžã‚¦ãƒ³ãƒˆä½ç½®ã‚’確定ã§ãã¾ã›ã‚“。"
msgid "Failed to connect to the HAL daemon: %s"
msgstr "HAL デーモンã¨ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
-#, c-format
-msgid "copy of %s"
-msgstr "%s ã®ã‚³ãƒ”ー"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
-#, c-format
-msgid "link to %s"
-msgstr "%s ã¸ã®ãƒªãƒ³ã‚¯"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
-#, c-format
-msgid "another copy of %s"
-msgstr "%s ã®åˆ¥ã®ã‚³ãƒ”ー"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
-#, c-format
-msgid "another link to %s"
-msgstr "%s ã¸ã®åˆ¥ã®ãƒªãƒ³ã‚¯"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
-#, c-format
-msgid "third copy of %s"
-msgstr "%s ã® 3 番目ã®ã‚³ãƒ”ー"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
-#, c-format
-msgid "third link to %s"
-msgstr "%s ã¸ã® 3 番目ã®ãƒªãƒ³ã‚¯"
-
-#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
-#, c-format
-msgid "%uth copy of %s"
-msgid_plural "%uth copy of %s"
-msgstr[0] "%2$s ã® %1$u 番目ã®ã‚³ãƒ”ー"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
-#, c-format
-msgid "%uth link to %s"
-msgid_plural "%uth link to %s"
-msgstr[0] "%2$s ã¸ã® %1$u 番目ã®ãƒªãƒ³ã‚¯"
-
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
-#, c-format
-msgid "Failed to create directory \"%s\""
-msgstr "フォルダ「%sã€ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
-#, c-format
-msgid "Failed to create named fifo \"%s\""
-msgstr "åå‰ã¤ãパイプ「%sã€ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "åå‰ã¤ãパイプãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
-#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "èªã¿è¾¼ã‚€ãŸã‚ã«ã€Œ%sã€ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "ファイル「%sã€ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚"
-
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "書ã込むãŸã‚ã«ã€Œ%sã€ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "「%sã€ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã‚’èªã¿è¾¼ã‚€ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
-#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "「%sã€ã¸ãƒ‡ãƒ¼ã‚¿ã‚’書ã込むã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
-#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "「%sã€ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "æ“作ã¯å–り消ã•ã‚Œã¾ã—ãŸã€‚"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "「%sã€ã®ãƒªãƒ³ã‚¯å…ˆã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
-#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "リンク「%sã€ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
-#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "「%sã€ã®ãƒ¢ãƒ¼ãƒ‰ã‚’変更ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "シンボリックリンクãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
-#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "「%sã€ã®ãƒ•ã‚¡ã‚¤ãƒ«æƒ…å ±ã‚’ç¢ºå®šã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
-#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "特殊ファイル「%sã€ã®ã‚³ãƒ”ーã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
msgstr "一括リãƒãƒ¼ãƒ ダイアãƒã‚°ã‚’é–‹ã"
@@ -517,58 +472,145 @@ msgid "Sort items in descending order"
msgstr "アイテムをé™é † (ãŠãˆã†ã„ã‚ Z-a ã®é †) ã§ä¸¦ã¹æ›¿ãˆã¾ã™ã€‚"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "æ“作ã®å®Ÿè¡Œã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "「%sã€ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "「%sã€ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "ファイルをコピーã—ã¦ã„ã¾ã™..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "リンクを作æˆã—ã¦ã„ã¾ã™..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "ファイルを移動ã—ã¦ã„ã¾ã™..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "ファイルを移動ã—ã¦ã„ã¾ã™..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"「%sã€ã¯æ°¸ä¹…ã«å‰Šé™¤ã•ã‚Œã¾ã™\n"
+"ãã‚Œã§ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯æ°¸ä¹…ã«å‰Šé™¤ã•ã‚Œã¾ã™\n"
+"ãã‚Œã§ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "削除ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯æ°¸ä¹…ã«å¤±ã‚ã‚Œã¾ã™ã€‚"
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "ファイルを削除ã—ã¦ã„ã¾ã™..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "ファイルを作æˆã—ã¦ã„ã¾ã™..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "フォルダを作æˆã—ã¦ã„ã¾ã™..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "空ã®ãƒ•ã‚¡ã‚¤ãƒ«(_E)"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "「%sã€ã®ãƒžã‚¦ãƒ³ãƒˆä½ç½®ã‚’確定ã§ãã¾ã›ã‚“。"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "「%sã€ã«æ–°è¦ãƒ•ã‚©ãƒ«ãƒ€ã‚’作æˆ"
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "フォルダを作æˆ(_F)..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "「%sã€ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "ファイルを削除ã—ã¦ã„ã¾ã™..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "「%sã€ã®æ¨™æº–アプリケーションをセットã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "アプリケーションã¯é¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -577,20 +619,20 @@ msgstr ""
"sã€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã®ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "ä»–ã®ã‚¢ãƒ—リ(_O)..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "アプリã§é–‹ã"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "指定コマンドを使用ã™ã‚‹(_C):"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -599,41 +641,40 @@ msgstr ""
"ã™ã€‚"
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "å‚ç…§(_B)..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "ã“ã®ç¨®é¡žã®ãƒ•ã‚¡ã‚¤ãƒ«ã®æ¨™æº–アプリケーションã«ã™ã‚‹(_D)"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "æ–°ã—ã„アプリケーション「%sã€ã‚’è¿½åŠ ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "「%sã€ã®å®Ÿè¡Œã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "ランãƒãƒ£ãƒ¼ã‚’削除(_R)"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr ""
"<i>%s</i> ã¨ã‚¿ã‚¤ãƒ—ãŒã€Œ%sã€ã®ä»–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’以下ã®ã‚¢ãƒ—リケーションã§é–‹ãã¾ã™:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -641,8 +682,7 @@ msgstr ""
"種類ãŒã€Œ%sã€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãアプリケーションをé¸æŠžã™ã‚‹ãŸã‚ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ "
"ã‚’å‚ç…§ã—ã¾ã™ã€‚"
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -651,12 +691,12 @@ msgstr ""
"種類ãŒã€Œ%sã€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ã標準ã®ã‚¢ãƒ—リケーションをé¸æŠžã—ãŸã‚‚ã®ã«å¤‰æ›´ã—ã¾"
"ã™ã€‚"
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "「%sã€ã‚’削除ã—ã¾ã™ãŒã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -670,39 +710,39 @@ msgstr ""
"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã®ã€Œã“ã‚Œã§é–‹ãã€ãƒ€ã‚¤ã‚¢ãƒã‚°ã«ã‚るカスタム・コマンド"
"ボックスを利用ã—ã¦ä½œæˆã•ã‚ŒãŸã‚¢ãƒ—リケーション・ランãƒãƒ£ãƒ¼ã®ã¿ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚"
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "アプリケーションをé¸æŠžã—ã¦ãã ã•ã„"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "実行å¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perlスクリプト"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Pythonスクリプト"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Rubyスクリプト"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "シェルスクリプト"
@@ -722,7 +762,7 @@ msgid "Other Applications"
msgstr "ä»–ã®ã‚¢ãƒ—リケーション"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "クリップボードã«è²¼ã‚Šä»˜ã‘ã‚‹ã‚‚ã®ã¯ã‚ã‚Šã¾ã›ã‚“。"
@@ -787,14 +827,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "å¿…è¦ã«å¿œã˜ã¦è¡¨ç¤ºæ¬„を自動的ã«æ‹¡ã’ã‚‹(_E)"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "ä¸æ˜Ž"
@@ -806,7 +847,7 @@ msgstr "フォルダをリスト表示ã—ã¾ã™ã€‚"
msgid "Compact view"
msgstr "リスト表示"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "æ–°ã—ã„åå‰ã‚’入力ã—ã¦ãã ã•ã„:"
@@ -832,16 +873,32 @@ msgstr "詳細ãªãƒ•ã‚¡ã‚¤ãƒ«æƒ…å ±ã¨å…±ã«ãƒ•ã‚©ãƒ«ãƒ€ã‚’リスト表示ã—ã¾
msgid "Details view"
msgstr "詳細表示"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "Daichi Kawahata <daichi@xfce.org>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "文書を表示ã™ã‚‹ãƒ–ラウザーã®èµ·å‹•ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "ã¯ã„(_Y)"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "å…¨ã¦ã«ã¯ã„(_A)"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "ã„ã„ãˆ(_N)"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "ã‚ャンセル(_C)"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "ã“ã“ã«ã‚³ãƒ”ー(_C)"
@@ -896,7 +953,7 @@ msgstr "ファイル所有者"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "アクセス権"
@@ -912,14 +969,10 @@ msgstr "ファイル"
msgid "File Name"
msgstr "ファイルå"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "ルートフォルダã«ä¸Šä½ã®ãƒ•ã‚©ãƒ«ãƒ€ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "ファイルシステム"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -955,14 +1008,14 @@ msgstr "アイコン表示"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "é–‹ã(_O)"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "æ–°è¦ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§é–‹ã"
@@ -1084,93 +1137,111 @@ msgid "Send the selected file to \"%s\""
msgid_plural "Send the selected files to \"%s\""
msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’「%sã€ã«é€ä¿¡ã—ã¾ã™ã€‚"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "壊れãŸãƒªãƒ³ã‚¯"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
msgstr[0] "%d個ã®ã‚¢ã‚¤ãƒ†ãƒ (%s) ãŒã‚ã‚Šã¾ã™ã€‚空ã容é‡: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d個ã®ã‚¢ã‚¤ãƒ†ãƒ ãŒã‚ã‚Šã¾ã™ã€‚空ã容é‡: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d個ã®ã‚¢ã‚¤ãƒ†ãƒ ãŒã‚ã‚Šã¾ã™ã€‚"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "「%sã€å£Šã‚ŒãŸãƒªãƒ³ã‚¯"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "「%1$sã€%3$sã¸ã®ãƒªãƒ³ã‚¯ (%2$s)"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "「%1$sã€%3$s (%2$s)"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "ç”»åƒã‚µã‚¤ã‚º:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d個ã®ã‚¢ã‚¤ãƒ†ãƒ (%s) ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d個ã®ã‚¢ã‚¤ãƒ†ãƒ ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã™ã€‚"
# NOTE: GObject property
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "é–“éš”"
# NOTE: GObject property
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "パスボタン間ã®ã‚¹ãƒšãƒ¼ã‚¹ã§ã™ã€‚"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "「%sã€ã‚’ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§é–‹ã"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "「%sã€ã‚’æ–°è¦ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§é–‹ã"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "「%sã€ã«æ–°è¦ãƒ•ã‚©ãƒ«ãƒ€ã‚’作æˆ"
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "フォルダを作æˆ(_F)..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1178,29 +1249,29 @@ msgstr ""
"以å‰ã«ã€Œåˆ‡ã‚Šå–ã‚Šã€ã¾ãŸã¯ã€Œã‚³ãƒ”ーã€ã§é¸æŠžã•ã‚Œã¦ã„るファイルを「%sã€ã«ã€Œç§»å‹•ã€"
"ã¾ãŸã¯ã€Œã‚³ãƒ”ーã€ã—ã¾ã™ã€‚"
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "フォルダã«è²¼ã‚Šä»˜ã‘"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "フォルダ「%sã€ã®ãƒ—ãƒãƒ‘ティを表示ã—ã¾ã™ã€‚"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "プãƒãƒ‘ティ(_P)"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "æ–°è¦ãƒ•ã‚©ãƒ«ãƒ€"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "æ–°è¦ãƒ•ã‚©ãƒ«ãƒ€ã‚’作æˆã—ã¾ã™ã€‚"
@@ -1218,12 +1289,12 @@ msgid "Failed to launch \"%s\""
msgstr "「%sã€ã®å®Ÿè¡Œã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
# NOTE: GObject property
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "アイコンã®ã‚µã‚¤ã‚º"
# NOTE: GObject property
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "パスエントリーã®ã‚¢ã‚¤ã‚³ãƒ³ã‚µã‚¤ã‚ºã§ã™ã€‚"
@@ -1305,17 +1376,15 @@ msgid "Stop applying permissions recursively."
msgstr "アクセス権をå†å¸°çš„ã«å¤‰æ›´ã—ã¦ã„ãã®ã‚’æ¢ã‚ã¾ã™ã€‚"
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "質å•"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "å†å¸°çš„ã«å¤‰æ›´ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
@@ -1323,11 +1392,11 @@ msgstr ""
"é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã®ä¸ã«ã‚ã‚‹å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚„\n"
"サブフォルダã«ã‚‚変更をé©ç”¨ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "å†ã³è³ªå•ã—ãªã„(_N)"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1337,29 +1406,29 @@ msgstr ""
"ã›ã‚“。今後ã“れを変更ã™ã‚‹ã«ã¯ç’°å¢ƒè¨å®šãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’ã”使用ãã ã•ã„。"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "「%sã€ã®ã‚°ãƒ«ãƒ¼ãƒ—を変更ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "æ–°ã—ã„アクセス権を有効ã«ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«æ‰€æœ‰è€…ã§ã™ã€‚"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "フォルダã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚’自動的ã«ç›´ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "フォルダã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚’ç›´ã™"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1368,77 +1437,57 @@ msgstr ""
"ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ãŒä¸€è²«ã™ã‚‹ã‚ˆã†ã«ã«ãƒªã‚»ãƒƒãƒˆã—ã¾ã™ã€‚ユーザーã®ã¿ãŒã“ã®"
"フォルダã®å†…容を見られã¾ã™ã€ã¾ãŸã€å¾Œã§ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã«å…¥ã‚‹äº‹ãŒã§ãã¾ã™ã€‚"
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "ã¯ã„(_Y)"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "å…¨ã¦ã«ã¯ã„(_A)"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "ã„ã„ãˆ(_N)"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "ã‚ャンセル(_C)"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "ファイルマãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã®ç’°å¢ƒè¨å®š"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "表示"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "標準ã®è¡¨ç¤º"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "æ–°è¦ãƒ•ã‚©ãƒ«ãƒ€ã®è¡¨ç¤ºæ–¹æ³•(_N):"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "アイコン表示"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "詳細リスト表示"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "リスト表示"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "最後ã«ä½¿ç”¨ã—ãŸè¡¨ç¤ºæ–¹æ³•"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "フォルダをファイルã®å‰ã«ã™ã‚‹(_F)"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"フォルダを並ã¹æ›¿ãˆã‚‹æ™‚ã«ãƒ•ã‚©ãƒ«ãƒ€ã‚’ファイルã®å‰ã«ä¸¦ã¹ã‚‹ãªã‚‰ã€ã“ã®ã‚ªãƒ—ションを"
"é¸æŠžã—ã¦ãã ã•ã„。"
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "サムãƒã‚¤ãƒ«ã‚’表示ã™ã‚‹(_S)"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1446,11 +1495,11 @@ msgstr ""
"フォルダ内ã®ãƒ—レビューå¯èƒ½ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示ã™ã‚‹ã«ã¯ã“ã®ã‚ªãƒ—ションを有効ã«ã—ã¦"
"ãã ã•ã„。ã“れらã¯è‡ªå‹•çš„ã«ä½œæˆã•ã‚Œã‚‹ã‚µãƒ ãƒã‚¤ãƒ«ã‚¢ã‚¤ã‚³ãƒ³ã¨ã—ã¦è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "æ–‡å—をアイコンã®éš£ã«ç½®ã(_T)"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1461,65 +1510,65 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "サイドペイン"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "ショートカットペイン"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "アイコンã®ã‚µã‚¤ã‚º(_I):"
# NOTE: 25%
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "ã¨ã¦ã‚‚å°ã•ã„"
# NOTE: 50%
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "å°ã•ã„"
# NOTE: 75%
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "å°‘ã—å°ã•ã„"
# NOTE: 100%
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "普通"
# NOTE: 125%
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "å°‘ã—大ãã„"
# NOTE: 150%
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "大ãã„"
# NOTE: 200%
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "ã¨ã¦ã‚‚大ãã„"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "アイコンã®ã‚·ãƒ³ãƒœãƒ«ã‚’表示(_E)"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1527,19 +1576,19 @@ msgstr ""
"ショートカットペインã«ã‚ã‚‹å…¨ã¦ã®ãƒ•ã‚©ãƒ«ãƒ€ã«ã‚·ãƒ³ãƒœãƒ«ã‚¢ã‚¤ã‚³ãƒ³ã‚’表示ã—ã¾ã™ã€‚ã“ã‚Œ"
"らã®ã‚·ãƒ³ãƒœãƒ«ã¯ãƒ•ã‚©ãƒ«ãƒ€ã®ãƒ—ãƒãƒ‘ティã®ãƒ€ã‚¤ã‚¢ãƒã‚°ã§å®šç¾©ã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "ツリーペイン"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "アイコンã®ã‚µã‚¤ã‚º(_S):"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "シンボルを表示(_M)"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1550,16 +1599,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "振る舞ã„"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "シングルクリックã§ã‚¢ã‚¤ãƒ†ãƒ を有効ã«ã™ã‚‹(_S)"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1567,7 +1619,7 @@ msgstr ""
"マウスãŒã‚¢ã‚¤ãƒ†ãƒ 上ã«ã‚る時\n"
"é¸æŠžçŠ¶æ…‹ã«ãªã‚‹ã¾ã§ã®æ™‚é–“(_E):"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1581,36 +1633,36 @@ msgstr ""
"ã§ãã¾ã™ã®ã§ã€ã‚¢ã‚¤ãƒ†ãƒ を有効ã«ã›ãšãŸã é¸æŠžã—ãŸã„ã®ã§ã—ãŸã‚‰ã€ãã†ã—ã¦ãã ã•"
"ã„。"
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "無効"
# XXX: how long does it take in millisecond?
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "ä¸é–“"
# XXX: how long does it take in millisecond?
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "é•·ã„"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "ダブルクリックã§ã‚¢ã‚¤ãƒ†ãƒ を有効ã«ã™ã‚‹(_D)"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "詳細..."
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "フォルダã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1620,171 +1672,176 @@ msgstr ""
"ファイルã«ã‚‚ã“ã®å¤‰æ›´ã‚’é©ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
"以下ã‹ã‚‰ã€æ¨™æº–ã§è¡Œã†ã“ã¨ã‚’é¸æŠžã—ã¦ãã ã•ã„:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "毎回質å•ã™ã‚‹"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "フォルダã®ã¿ã«é©ç”¨ã™ã‚‹"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "フォルダ内ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚‚é©ç”¨ã™ã‚‹"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(残り %lu 時間)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(残り %lu 分)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(残り %lu 秒)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "一般"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "åå‰:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "種類:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "ã“ã‚Œã§é–‹ã:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "リンク先:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "削除(_D)"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "変更日時:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "アクセス日時:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "サイズ:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "容é‡:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "空ã容é‡:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "シンボル"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - プãƒãƒ‘ティ"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "「%sã€ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "ファイル(_F)"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "é€ä¿¡(_S)"
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "ファイルã®å³ã‚¯ãƒªãƒƒã‚¯ãƒ¡ãƒ‹ãƒ¥ãƒ¼"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ (_A)..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "åå‰å¤‰æ›´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒªã‚¹ãƒˆã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ã—ã¾ã™ã€‚"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "クリア"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "以下ã®ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã‚’クリアã—ã¾ã™ã€‚"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã«ã¤ã„ã¦(_A)"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Thunar 一括リãƒãƒ¼ãƒ ã«ã¤ã„ã¦ã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "プãƒãƒ‘ティ(_P)..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ—ãƒãƒ‘ティを表示ã—ã¾ã™ã€‚"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "複数ã®ãƒ•ã‚¡ã‚¤ãƒ«åを変更ã—ã¾ã™"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "複数ã®ãƒ•ã‚¡ã‚¤ãƒ«åを変更(_R)"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
"ã“ã“をクリックã™ã‚‹ã¨ã€ä¸Šã«ãƒªã‚¹ãƒˆã•ã‚Œã¦ã„るファイルã®åå‰ã‚’実際ã«å¤‰æ›´ã—ã¾ã™ã€‚"
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "æ–°ã—ã„åå‰"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
"ã“ã“をクリックã™ã‚‹ã¨ã€é¸æŠžã—ãŸãƒªãƒãƒ¼ãƒ æ“作ã«ã¤ã„ã¦ã®æ–‡æ›¸ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
@@ -1792,7 +1849,7 @@ msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1805,30 +1862,30 @@ msgstr ""
"「Yesã€ã«ãªã£ã¦ã„ã‚‹ã‹ã‚’確èªã—ã¦ãã ã•ã„。"
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "åå‰å¤‰æ›´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¦ãã ã•ã„"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "音楽ファイル"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "ç”»åƒãƒ•ã‚¡ã‚¤ãƒ«"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "動画ファイル"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "一括リãƒãƒ¼ãƒ "
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1836,18 +1893,18 @@ msgstr ""
"Thunar 一括リãƒãƒ¼ãƒ ã¯ä¸€åº¦ã«è¤‡æ•°ã®ãƒ•ã‚¡ã‚¤ãƒ«åã‚’\n"
"変更ã™ã‚‹å¼·åŠ›ã§æ‹¡å¼µæ€§ã®ã‚るツールã§ã™ã€‚"
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "ファイルを削除"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "åå‰å¤‰æ›´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒªã‚¹ãƒˆã‹ã‚‰é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã—ã¾ã™ã€‚"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "一括リãƒãƒ¼ãƒ - ファイルをã¾ã¨ã‚ã¦ãƒªãƒãƒ¼ãƒ ã—ã¾ã™"
@@ -1891,119 +1948,119 @@ msgid_plural "Add the selected folders to the shortcuts side pane"
msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã‚’å·¦ã®ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆãƒšã‚¤ãƒ³ã«è¿½åŠ ã—ã¾ã™ã€‚"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "マウント(_M)"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "å–り出ã—(_J)"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "マウント解除(_U)"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "ショートカットを削除(_R)"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "ショートカットã®åå‰å¤‰æ›´(_N)"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "パス「%sã€ã¯ãƒ•ã‚©ãƒ«ãƒ€ã‚’å‚ç…§ã—ã¦ã„ã¾ã›ã‚“。"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "ショートカットã®è¿½åŠ ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "「%sã€ã®å–り出ã—ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "「%sã€ã®ãƒžã‚¦ãƒ³ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "「%sã€ã®ãƒžã‚¦ãƒ³ãƒˆè§£é™¤ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "ã“ã“をクリックã™ã‚‹ã¨ã€ãƒ•ã‚©ãƒ«ãƒ€ã®åˆè¨ˆã‚µã‚¤ã‚ºã®è¨ˆç®—ã‚’ä¸æ¢ã—ã¾ã™ã€‚"
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "計算をä¸æ–ã—ã¾ã—ãŸã€‚"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "計算ã—ã¦ã„ã¾ã™..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s ãƒã‚¤ãƒˆ"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u 個ã®ã‚¢ã‚¤ãƒ†ãƒ ã€åˆè¨ˆ %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "フォルダã®å³ã‚¯ãƒªãƒƒã‚¯ãƒ¡ãƒ‹ãƒ¥ãƒ¼"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "ç¾åœ¨ã®ãƒ•ã‚©ãƒ«ãƒ€ã«ç©ºã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’作æˆã—ã¾ã™ã€‚"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "切りå–ã‚Š(_T)"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "コピー(_C)"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "貼り付ã‘(_P)"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"以å‰ã«ã€Œåˆ‡ã‚Šå–ã‚Šã€ã¾ãŸã¯ã€Œã‚³ãƒ”ーã€ã§é¸æŠžã•ã‚Œã¦ã„るファイルを「移動ã€ã¾ãŸã¯"
"「コピーã€ã—ã¾ã™ã€‚"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "削除(_D)"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2011,148 +2068,136 @@ msgstr ""
"以å‰ã«ã€Œåˆ‡ã‚Šå–ã‚Šã€ã¾ãŸã¯ã€Œã‚³ãƒ”ーã€ã§é¸æŠžã•ã‚Œã¦ã„るファイルをé¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€"
"ã«ã€Œç§»å‹•ã€ã¾ãŸã¯ã€Œã‚³ãƒ”ーã€ã—ã¾ã™ã€‚"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž(_A)"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¾ã™ã€‚"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "パターンã§é¸æŠž(_B)..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "ã‚る特定ã®ãƒ‘ターンã«ä¸€è‡´ã™ã‚‹å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¾ã™ã€‚"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "コピーを作æˆ(_P)"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "リンクを作æˆ(_K)"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "åå‰å¤‰æ›´(_R)..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®åå‰ã‚’変更ã—ã¾ã™ã€‚"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "文書を作æˆ(_D)"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "フォルダã®å†…容をèªã¿è¾¼ã‚“ã§ã„ã¾ã™..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "テンプレート「%sã€ã‹ã‚‰æ–‡æ›¸ã‚’作æˆ"
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"「%sã€ã¯æ°¸ä¹…ã«å‰Šé™¤ã•ã‚Œã¾ã™\n"
-"ãã‚Œã§ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯æ°¸ä¹…ã«å‰Šé™¤ã•ã‚Œã¾ã™\n"
-"ãã‚Œã§ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "削除ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯æ°¸ä¹…ã«å¤±ã‚ã‚Œã¾ã™ã€‚"
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "パターンã§é¸æŠžã—ã¾ã™"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "é¸æŠž(_S)"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "パターン(_P):"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "「%sã€ã®åå‰å¤‰æ›´"
# FIXME: should be revised
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "XDSã§ä¸æ£ãªãƒ•ã‚¡ã‚¤ãƒ«åをドラッグã—ã¦ã„ã¾ã™ã€‚"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "URL「%sã€ã®ãƒªãƒ³ã‚¯ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "フォルダ「%sã€ã‚’é–‹ãã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’「貼り付ã‘ã€ã‚³ãƒžãƒ³ãƒ‰ã§ç§»å‹•ã§ãるよã†ã«ã—ã¾ã™ã€‚"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’「貼り付ã‘ã€ã‚³ãƒžãƒ³ãƒ‰ã§ã‚³ãƒ”ーã§ãるよã†ã«ã—ã¾ã™ã€‚"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã—ã¾ã™ã€‚"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚³ãƒ”ーを作æˆã—ã¾ã™ã€‚"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚³ãƒ”ーを作æˆã—ã¾ã™ã€‚"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒªãƒ³ã‚¯ã‚’作æˆã—ã¾ã™ã€‚"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®åå‰ã‚’変更ã—ã¾ã™ã€‚"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®åå‰ã‚’変更ã—ã¾ã™ã€‚"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "作æˆ"
@@ -2171,20 +2216,30 @@ msgstr "テンプレートã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“"
msgid "_Empty File"
msgstr "空ã®ãƒ•ã‚¡ã‚¤ãƒ«(_E)"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "èªã¿è¾¼ã‚“ã§ã„ã¾ã™..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "フォルダã«è²¼ã‚Šä»˜ã‘(_P)"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "プãƒãƒ‘ティ(_R)..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "æ–°è¦ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‹ã(_W)"
@@ -2621,23 +2676,23 @@ msgid "Shutter Speed:"
msgstr "シャッター速度:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "ソフトウェア:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "ç”»åƒ"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "ç”»åƒåž‹å¼:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "ç”»åƒã‚µã‚¤ã‚º:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2811,21 +2866,21 @@ msgstr "%ld ã«ã‚ã‚‹æ–‡å—ã¯èª¤ã£ãŸæ£è¦è¡¨ç¾ã§ã™: %s"
msgid "Search & Replace"
msgstr "検索ã¨ç½®æ›"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "「%sã€ã‚’圧縮アーカイブã¨ã—ã¦é€ä¿¡ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "ç›´ã«é€ä¿¡(_D)"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "圧縮ã—ã¦é€ä¿¡(_P)"
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
@@ -2835,17 +2890,17 @@ msgstr ""
"ã‹ã€ã‚ã‚‹ã„ã¯åœ§ç¸®ã™ã‚‹ã‹ã®ã©ã¡ã‚‰ã‹ã‚’é¸æŠžã§ãã¾ã™ã€‚大ããªãƒ•ã‚¡ã‚¤ãƒ«ã‚’é€ä¿¡ã™ã‚‹ã®ãª"
"ら圧縮ã™ã‚‹ã“ã¨ã‚’勧ã‚ã¾ã™ã€‚"
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] "%d個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’圧縮アーカイブã¨ã—ã¦é€ä¿¡ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "アーカイブã¨ã—ã¦é€ä¿¡(_A)"
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2858,35 +2913,35 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "ファイルを圧縮ã—ã¦ã„ã¾ã™..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "ZIPコマンドãŒã‚¨ãƒ©ãƒ¼%dã§ä¸æ–ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr "一時作æ¥ãƒ•ã‚©ãƒ«ãƒ€ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "「%sã€ã¸ã®ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
msgstr[0] "%d個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’圧縮ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "æ–°è¦ãƒ¡ãƒ¼ãƒ«ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
@@ -2894,6 +2949,33 @@ msgstr "æ–°è¦ãƒ¡ãƒ¼ãƒ«ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
msgid "Mail Recipient"
msgstr "メールã®å—ã‘å–ã‚Š"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "HAL デーモンã¨ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "アクション"
@@ -3134,11 +3216,11 @@ msgstr "ルートコンテã‚ストã§çµ‚了è¦ç´ ãƒãƒ³ãƒ‰ãƒ©ãƒ¼ãŒå‘¼ã³å‡ºã•
msgid "Unknown closing element <%s>"
msgstr "ä¸æ˜Žãªé–‰ã˜è¦ç´ <%s> ãŒã‚ã‚Šã¾ã™"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "ファイル「uca.xmlã€ã‚’ä¿å˜ã™ã‚‹å ´æ‰€ã‚’確定ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "コマンドãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
@@ -3187,3 +3269,88 @@ msgstr "Thunarã§ãƒ•ã‚©ãƒ«ãƒ€ã‚’é–‹ã"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "指定ã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã‚’ Thunar ã§é–‹ãã¾ã™"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã—ã¾ã™ã€‚"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "「%sã€ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚’変更ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s。\n"
+#~ "\n"
+#~ "ã“れを飛ã°ã—ã¾ã™ã‹ï¼Ÿ"
+
+# FIXME: stat?
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "「%sã€ã®ãƒ•ã‚¡ã‚¤ãƒ«æƒ…å ±ã‚’å–å¾—ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "ファイル「%sã€ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚ã“れを空ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ç½®ãæ›ãˆã¦ã‚‚よã‚ã—ã„ã§"
+#~ "ã™ã‹ï¼Ÿ"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "「%sã€ã‚’削除ã§ãã¾ã›ã‚“。\n"
+#~ "\n"
+#~ "ã“れを飛ã°ã—ã¾ã™ã‹ï¼Ÿ"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "空ã®ãƒ•ã‚¡ã‚¤ãƒ«ã€Œ%sã€ã‚’作æˆã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n"
+#~ "\n"
+#~ "ã“れを飛ã°ã—ã¾ã™ã‹ï¼Ÿ"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "ファイル「%sã€ã®çŠ¶æ…‹ã‚’å–å¾—ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s。\n"
+#~ "\n"
+#~ "上書ãã—ã¾ã™ã‹ï¼Ÿ"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "フォルダ「%sã€ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "フォルダを削除ã—ã¦ã„ã¾ã™..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "フォルダ「%sã€ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "ルートフォルダを転é€ã§ãã¾ã›ã‚“。"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "åå‰ã¤ãパイプãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。"
+
+#~ msgid "Operation canceled"
+#~ msgstr "æ“作ã¯å–り消ã•ã‚Œã¾ã—ãŸã€‚"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "「%sã€ã®ãƒªãƒ³ã‚¯å…ˆã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "「%sã€ã®ãƒ¢ãƒ¼ãƒ‰ã‚’変更ã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "特殊ファイル「%sã€ã®ã‚³ãƒ”ーã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
diff --git a/po/lt.po b/po/lt.po
index fc99349072a1d2dc3f3d7b2c8689a023a043fc3f..1a0cd88e8339e8972db8edd4c22e928b1592bbb9 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-05-26 11:16+0300\n"
"Last-Translator: mantas <mantaz@users.sourceforge.net>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -18,267 +18,138 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
"100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr ""
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr ""
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr ""
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr ""
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr ""
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr ""
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+msgid "Only local files may be renamed"
msgstr ""
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
msgstr ""
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
#, c-format
-msgid "Failed to remove \"%s\": %s"
+msgid "Failed to change permissions of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
#, c-format
-msgid "Failed to load application from file %s"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
+msgid "Failed to change file owenr of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
#, c-format
-msgid "%s document"
+msgid "Failed to change file group of \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr ""
-
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
+msgid "The file \"%s\" already exists"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
+msgid "Failed to create empty file \"%s\""
msgstr ""
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
+#, c-format
+msgid "Failed to open \"%s\" for reading"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
+msgid "Failed to write data to \"%s\""
msgstr ""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
+msgid "Failed to remove \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
+msgid "Failed to read data from \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr ""
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
@@ -286,7 +157,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
@@ -294,86 +165,184 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr ""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
+#, c-format
+msgid "Failed to create symbolic link \"%s\""
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr ""
+
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
#, c-format
-msgid "Failed to open \"%s\" for reading"
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr ""
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
#, c-format
-msgid "The file \"%s\" already exists"
+msgid "Failed to link \"%s\" to \"%s\""
msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
#, c-format
-msgid "Failed to open \"%s\" for writing"
+msgid "Failed to move \"%s\" to \"%s\""
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
#, c-format
-msgid "Failed to read data from \"%s\""
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
+msgid "Failed to load application from file %s"
msgstr ""
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
+msgid "Failed to remove \"%s\": %s"
msgstr ""
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
+msgid "%s document"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
+msgid "The URI \"%s\" is invalid"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr ""
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr ""
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
+msgid "Unknown user \"%s\""
+msgstr ""
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
msgstr ""
#: ../thunar/main.c:54
@@ -491,137 +460,216 @@ msgid "Sort items in descending order"
msgstr ""
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr ""
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr ""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr ""
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr ""
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr ""
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+msgid "Moving files into the trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr ""
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr ""
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr ""
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr ""
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+msgid "_Empty Trash"
+msgstr ""
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr ""
+
+#: ../thunar/thunar-application.c:1346
+#, c-format
+msgid "Create the folder \"%s\"?"
+msgstr ""
+
+#: ../thunar/thunar-application.c:1350
+msgid "C_reate Folder"
+msgstr ""
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, c-format
+msgid "Failed to restore \"%s\""
+msgstr ""
+
+#: ../thunar/thunar-application.c:1400
+msgid "Restoring files..."
+msgstr ""
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr ""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr ""
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
msgstr ""
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr ""
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
msgstr ""
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr ""
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr ""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr ""
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr ""
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
msgstr ""
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -630,39 +678,39 @@ msgid ""
"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr ""
@@ -682,7 +730,7 @@ msgid "Other Applications"
msgstr ""
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr ""
@@ -744,14 +792,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr ""
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr ""
@@ -763,7 +812,7 @@ msgstr ""
msgid "Compact view"
msgstr ""
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr ""
@@ -789,16 +838,32 @@ msgstr ""
msgid "Details view"
msgstr ""
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr ""
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr ""
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr ""
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr ""
@@ -853,7 +918,7 @@ msgstr ""
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr ""
@@ -869,14 +934,10 @@ msgstr ""
msgid "File Name"
msgstr ""
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr ""
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr ""
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -910,14 +971,14 @@ msgstr ""
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr ""
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr ""
@@ -1060,12 +1121,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] ""
msgstr[1] ""
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr ""
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1074,7 +1135,7 @@ msgstr[1] ""
msgstr[2] ""
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
@@ -1082,7 +1143,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
@@ -1090,22 +1151,36 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr ""
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr ""
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr ""
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr ""
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
@@ -1113,7 +1188,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
@@ -1121,68 +1196,72 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr ""
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr ""
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr ""
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr ""
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr ""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr ""
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
msgstr ""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr ""
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr ""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr ""
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr ""
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr ""
@@ -1199,11 +1278,11 @@ msgstr ""
msgid "Failed to launch \"%s\""
msgstr ""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr ""
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr ""
@@ -1281,27 +1360,25 @@ msgid "Stop applying permissions recursively."
msgstr ""
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1309,114 +1386,94 @@ msgid ""
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr ""
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
"folder afterwards."
msgstr ""
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr ""
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr ""
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr ""
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr ""
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr ""
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1425,76 +1482,76 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1503,22 +1560,25 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1527,53 +1587,53 @@ msgid ""
"to select the item without activating it."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr ""
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
"folder. Select the default behavior below:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr ""
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1581,7 +1641,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1589,7 +1649,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1597,147 +1657,151 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr ""
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr ""
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+msgid "Deleted:"
+msgstr ""
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr ""
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr ""
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr ""
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr ""
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr ""
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr ""
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1745,43 +1809,43 @@ msgid ""
msgstr ""
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr ""
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] ""
@@ -1789,7 +1853,7 @@ msgstr[1] ""
msgstr[2] ""
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr ""
@@ -1833,80 +1897,80 @@ msgstr[1] ""
msgstr[2] ""
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr ""
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr ""
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr ""
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr ""
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr ""
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr ""
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr ""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr ""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr ""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr ""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr ""
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr ""
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr ""
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr ""
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
@@ -1914,194 +1978,183 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr ""
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr ""
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr ""
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr ""
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr ""
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr ""
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
msgstr ""
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr ""
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr ""
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr ""
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr ""
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr ""
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr ""
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr ""
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr ""
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr ""
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr ""
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr ""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr ""
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr ""
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr ""
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr ""
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr ""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr ""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr ""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
+#: ../thunar/thunar-standard-view.c:3349
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
msgstr[0] ""
msgstr[1] ""
-msgstr[2] ""
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+#: ../thunar/thunar-standard-view.c:3380
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../thunar/thunar-standard-view.c:3388
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] ""
+msgstr[1] ""
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr ""
@@ -2120,20 +2173,30 @@ msgstr ""
msgid "_Empty File"
msgstr ""
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr ""
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr ""
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr ""
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr ""
@@ -2543,23 +2606,23 @@ msgid "Shutter Speed:"
msgstr ""
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr ""
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2730,39 +2793,39 @@ msgstr ""
msgid "Search & Replace"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2772,28 +2835,28 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr ""
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr ""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2801,7 +2864,7 @@ msgstr[0] ""
msgstr[1] ""
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr ""
@@ -2809,6 +2872,32 @@ msgstr ""
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+msgid "Failed to connect to the Trash"
+msgstr ""
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr ""
@@ -3018,11 +3107,11 @@ msgstr ""
msgid "Unknown closing element <%s>"
msgstr ""
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr ""
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index b30668f8a60f559c190e373a21d5253e36a7a988..446838fc7f12b20dbb9868114aa783968d75cc73 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-03-25 18:02+0100\n"
"Last-Translator: Vincent Tunru <imnotb@gmail.com>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -16,90 +16,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Bestanden aan het ophalen..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Wilt u dit bestand overslaan?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, fuzzy, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Het definieren van bestandsinfo `%s' is mislukt: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, fuzzy, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Het veranderen van de toestemmingen van `%s' is mislukt: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, fuzzy, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Het veranderen van de eigenaar van `%s' is mislukt: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, fuzzy, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Het veranderen van de bestandsgroep van `%s' is mislukt: %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, fuzzy, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr ""
-"Het bestand `%s' bestaat al. Wilt u dit vervangen door een leeg bestand?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, fuzzy, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Fout bij het verwijderen van %s.\n"
-"\n"
-"Wilt u het overslaan?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, fuzzy, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Fout bij het maken van leeg bestand %s.\n"
-"\n"
-"Wilt u deze stap overslaan?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
#, fuzzy
msgid "Failed to read folder contents"
msgstr "Inhoud van de map aan het laden..."
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
#, fuzzy
msgid "Unknown error"
msgstr "Onbekende eigenaar"
@@ -107,7 +30,7 @@ msgstr "Onbekende eigenaar"
# Unknown word "Exec"
# Obekend woord: "Exec"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
#, fuzzy
msgid "No Exec field specified"
msgstr "Geen <Exec> veld geselecteerd"
@@ -115,213 +38,152 @@ msgstr "Geen <Exec> veld geselecteerd"
# Unknown word "Exec"
# Obekend woord: "Exec"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
#, fuzzy
msgid "No URL field specified"
msgstr "Geen <Exec> veld geselecteerd"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Ongeldig bureublad-bestand"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
#, fuzzy
msgid "Failed to parse file"
msgstr "Verwerken van bestand niet mogelijk"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Ongeldige bestandsnaam"
-# Unknown word "stat"
-# Obekend woord: "stat"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, fuzzy, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Het <stat> van bestand `%s' is mislukt: %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Wilt u dit bestand overschrijven?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, fuzzy, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Het verwijderen van `%s' is mislukt: %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Fout bij het laden van de applicatie van bestand %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
+#: ../thunar-vfs/thunar-vfs-info.c:458
#, fuzzy
-msgid "Command"
-msgstr "_Commando:"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-#, fuzzy
-msgid "The command to run the mime handler"
-msgstr "Commando om mime <handler> uit te voeren"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Vaandels"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-#, fuzzy
-msgid "The flags for the mime handler"
-msgstr "Vaandels van mime <handler>"
+msgid "Only local files may be renamed"
+msgstr "Fout bij het wijzigen van de naam van `%s'"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-#, fuzzy
-msgid "Icon"
-msgstr "_Icoon:"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Aan het voorbereiden..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-#, fuzzy
-msgid "The icon of the mime handler"
-msgstr "Icoon van mime <handler>"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Het veranderen van de toestemmingen van `%s' is mislukt: %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Naam:"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Het veranderen van de eigenaar van `%s' is mislukt: %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-#, fuzzy
-msgid "The name of the mime handler"
-msgstr "Naam van mime <handler>"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Het veranderen van de bestandsgroep van `%s' is mislukt: %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "%s document"
-msgstr "%s document"
+msgid "The file \"%s\" already exists"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+# Unknown word "fifo"
+# Onbekend woord: "fifo"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
#, fuzzy, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Fout bij het maken van map `%s'"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Pad te lang voor buffer"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI te lang voor buffer"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Grootte"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Voorkeursgrootte van voorproef pictogrammen"
-
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Mappen aan het verwijderen..."
+msgid "Failed to create empty file \"%s\""
+msgstr "Fout bij het maken van genoemde <fifo> `%s'"
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, fuzzy, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Fout bij het verwijderen van de map `%s' : %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Kan de hoofdmap niet verplaatsen"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Aan het voorbereiden..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Fout bij het openen van `%s' om te lezen"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Ongeldig pad"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, fuzzy, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Fout bij het openen van `%s' om te schrijven"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, fuzzy, c-format
-msgid "Unknown user \"%s\""
-msgstr "Onbekende gebruiker '%s'"
+msgid "Failed to write data to \"%s\""
+msgstr "Fout bij het schrijven naar `%s'"
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, fuzzy, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Fout bij het ophalen van bestandsinfo van `%s'"
+msgid "Failed to remove \"%s\""
+msgstr "Het verwijderen van `%s' is mislukt: %s"
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, fuzzy, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Fout bij het veranderen van de modus van `%s'"
+msgid "Failed to read data from \"%s\""
+msgstr "Fout bij het lezen van `%s'"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "Kopie van %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "Snelkoppeling naar %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "Tweede kopie van %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "Tweede snelkoppeling naar %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "Derde kopie van %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "Derde snelkoppeling naar %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%uste kopie van %s"
msgstr[1] "%ude kopie van %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%uste snelkoppeling naar %s"
msgstr[1] "%ude snelkoppeling naar %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, fuzzy, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Fout bij het ophalen van bestandsinfo van `%s'"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, fuzzy, c-format
msgid "Failed to create directory \"%s\""
msgstr "Fout bij het maken van map `%s'"
@@ -329,82 +191,176 @@ msgstr "Fout bij het maken van map `%s'"
# Unknown word "fifo"
# Onbekend woord: "fifo"
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, fuzzy, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Fout bij het maken van genoemde <fifo> `%s'"
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
+#, fuzzy, c-format
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Fout bij het maken van symbolische snelkoppeling `%s'"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
#, fuzzy
-msgid "Named pipes are not supported"
+msgid "Symbolic links are not supported"
msgstr "In daemon modus draaien"
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Bestandssysteem"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
#, fuzzy, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Fout bij het openen van `%s' om te lezen"
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Fout bij het wijzigen van de naam van `%s'"
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
#, fuzzy, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Fout bij het openen van `%s' om te schrijven"
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Fout bij het wijzigen van de naam van `%s'"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
#, fuzzy, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Fout bij het lezen van `%s'"
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Fout bij het wijzigen van de naam van `%s'"
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
#, fuzzy, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Fout bij het schrijven naar `%s'"
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Het pad '%s' verwijst niet naar een map"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
+#, c-format
+msgid "Failed to load application from file %s"
+msgstr "Fout bij het laden van de applicatie van bestand %s"
+
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, fuzzy, c-format
-msgid "Failed to remove \"%s\""
+msgid "Failed to remove \"%s\": %s"
msgstr "Het verwijderen van `%s' is mislukt: %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Actie geannulleerd"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+#, fuzzy
+msgid "Command"
+msgstr "_Commando:"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, fuzzy, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Fout bij het lezen van snelkopplingsdoel `%s'"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+#, fuzzy
+msgid "The command to run the mime handler"
+msgstr "Commando om mime <handler> uit te voeren"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
-#, fuzzy, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Fout bij het maken van symbolische snelkoppeling `%s'"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Vaandels"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
-#, fuzzy, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Fout bij het veranderen van de modus van `%s'"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+#, fuzzy
+msgid "The flags for the mime handler"
+msgstr "Vaandels van mime <handler>"
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
#, fuzzy
-msgid "Symbolic links are not supported"
-msgstr "In daemon modus draaien"
+msgid "Icon"
+msgstr "_Icoon:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+#, fuzzy
+msgid "The icon of the mime handler"
+msgstr "Icoon van mime <handler>"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Naam:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+#, fuzzy
+msgid "The name of the mime handler"
+msgstr "Naam van mime <handler>"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
+#, c-format
+msgid "%s document"
+msgstr "%s document"
+
+#: ../thunar-vfs/thunar-vfs-path.c:362
+#, c-format
+msgid "The URI \"%s\" is invalid"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Pad te lang voor buffer"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI te lang voor buffer"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Grootte"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Voorkeursgrootte van voorproef pictogrammen"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Bestanden aan het ophalen..."
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Ongeldig pad"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, fuzzy, c-format
-msgid "Failed to determine file info for \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "Onbekende gebruiker '%s'"
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, fuzzy, c-format
+msgid "Failed to determine the mount point for %s"
msgstr "Fout bij het ophalen van bestandsinfo van `%s'"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, fuzzy, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Fout bij het kopiëren van speciaal bestand `%s'"
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Fout bij het veranderen van de modus van `%s'"
#: ../thunar/main.c:54
#, fuzzy
@@ -528,58 +484,148 @@ msgid "Sort items in descending order"
msgstr "Items sorteren in aflopende volgorde"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Fout bij het uitvoeren van de operatie"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, fuzzy, c-format
msgid "Failed to open \"%s\""
msgstr "Fout bij het wijzigen van de naam van `%s'"
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, fuzzy, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Fout bij het wijzigen van de naam van `%s'"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Bestanden aan het kopiëren..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Symbolische snelkoppelingen aan het maken..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Bestanden aan het verplaatsen..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Bestanden aan het verplaatsen..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Weet u zeker dat u\n"
+"\"%s\" voorgoed wilt verwijderen?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Weet u zeker dat u\n"
+"het geselecteerde bestand voorgoed wilt verwijderen?"
+msgstr[1] ""
+"Weet u zeker dat u\n"
+"de geselecteerde bestanden voorgoed wilt verwijderen?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Als u een bestand wist, is het voorgoed verloren."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Bestanden aan het verwijderen..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Bestanden aan het maken..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Mappen aan het maken..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "_Leeg Bestand"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Fout bij het ophalen van bestandsinfo van `%s'"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Maak _Map..."
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Maak _Map..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Het verwijderen van `%s' is mislukt: %s"
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Bestanden aan het verwijderen..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, fuzzy, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Fout bij het instellen van een standaard programma voor `%s'"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Geen programma geselecteerd"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, fuzzy, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -588,20 +634,20 @@ msgstr ""
"andere bestanden van het type \"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Ander Programma..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Openen Met"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Gebruik een _alternatief commando:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -610,42 +656,41 @@ msgstr ""
"bovenstaande lijst beschikbaar is."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
#, fuzzy
msgid "_Browse..."
msgstr "_Bladeren"
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "_Standaard voor dit type bestand gebruiken"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, fuzzy, c-format
msgid "Failed to add new application \"%s\""
msgstr "Fout bij het toevoegen van het nieuwe programma `%s'"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, fuzzy, c-format
msgid "Failed to execute \"%s\""
msgstr "Fout bij het uitvoeren van `%s'"
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
#, fuzzy
msgid "_Remove Launcher"
msgstr "Snelkoppeling _Verwijderen"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Open <i>%s</i> en andere bestanden van het type \"%s\" met:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, fuzzy, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -653,8 +698,7 @@ msgstr ""
"Blader door het bestandssysteem om een programma te selecteren om te "
"gebruiken voor deze actie."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -663,14 +707,14 @@ msgstr ""
"Gebruik de geselecteerde applicatie om standaard bestanden van type \"%s\" "
"te openen."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, fuzzy, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr ""
"Weet u zeker dat u\n"
"\"%s\" voorgoed wilt verwijderen?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -679,39 +723,39 @@ msgid ""
"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Selecteer een programma"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Alle Bestanden"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Uitvoerbare bestanden"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perl scripts"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Python Scripts"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Ruby Scripts"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shell Scripts"
@@ -731,7 +775,7 @@ msgid "Other Applications"
msgstr "Andere Programma's"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Er is niets op het klembord om te plakken"
@@ -799,14 +843,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "Kolommen automatisch _uitklappen wanneer nodig"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Onbekend"
@@ -819,7 +864,7 @@ msgstr "Mapweergave gebaseerd op iconen"
msgid "Compact view"
msgstr ""
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Nieuwe naam invoeren:"
@@ -847,17 +892,33 @@ msgstr "Gedetailleerde mappenweergave"
msgid "Details view"
msgstr "Gedetailleerde weergavemodus"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "Vincent Tunru <imnotb@gmail.com>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
#, fuzzy
msgid "Failed to open the documentation browser"
msgstr "Fout bij het openen van de sjablonen map"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Ja"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Ja op _alles"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Nee"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Annuleren"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "Hier _kopiëren"
@@ -918,7 +979,7 @@ msgstr "Eigenaar:"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Toestemmingen"
@@ -936,14 +997,10 @@ msgstr "_Bestand"
msgid "File Name"
msgstr "Bestandsbeheerder"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Het hoofdmap heeft geen bovenliggende map"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Bestandssysteem"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -979,14 +1036,14 @@ msgstr "Icoon weergavemodus"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Openen"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Openen in Nieuw Venster"
@@ -1129,12 +1186,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Geselecteerde items openen"
msgstr[1] "Geselecteerde items openen"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "foute verwijzing"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, fuzzy, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1142,113 +1199,132 @@ msgstr[0] "%d item, vrije ruimte: %s"
msgstr[1] "%d items, vrije ruimte: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d item, vrije ruimte: %s"
msgstr[1] "%d items, vrije ruimte: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d item"
msgstr[1] "%d items"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" foute verwijzing"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) verwijzing naar %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+#, fuzzy
+msgid "Image Size:"
+msgstr "Afbeeldingen"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d item geselecteerd (%s)"
msgstr[1] "%d items geselecteerd (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d item geselecteerd"
msgstr[1] "%d items geselecteerd"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Witruimte"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Hoeveelheid witruimte tussen padknoppen"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, fuzzy, c-format
msgid "Open \"%s\" in this window"
msgstr "Openen in Nieuw Venster"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, fuzzy, c-format
msgid "Open \"%s\" in a new window"
msgstr "Openen in Nieuw Venster"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, fuzzy, c-format
msgid "Create a new folder in \"%s\""
msgstr "Maak _Map..."
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Maak _Map..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
msgstr "Verplaats of kopiëer bestanden naar \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
#, fuzzy
msgid "Paste Into Folder"
msgstr "Bestanden in Map Plakken"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, fuzzy, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Bekijk de eigenschappen van het geselecteerde bestand"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
#, fuzzy
msgid "_Properties"
msgstr "_Eigenschappen"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Nieuwe Map"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
#, fuzzy
msgid "Create New Folder"
msgstr "Maak _Map..."
@@ -1266,11 +1342,11 @@ msgstr "_Locatie"
msgid "Failed to launch \"%s\""
msgstr "Het openen van `%s' is mislukt"
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Icoongrootte"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Icoongrootte voor pad invoer"
@@ -1353,17 +1429,15 @@ msgid "Stop applying permissions recursively."
msgstr "Stop met het recursief toepassen van toestemmingen."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Vraag"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Recursief toepassen?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1372,11 +1446,11 @@ msgstr ""
"Wilt u de veranderingen recursief toepassen?\n"
"(Op alle bestanden en mappen in de geselecteerde map)"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Niet weer vragen"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1386,29 +1460,29 @@ msgstr ""
"gevraagd. U kund het voorkeursscherm gebruiken om uw keuze later te wijzigen."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Probleem bij het veranderen van de groep"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Probleem bij het toepassen van de nieuwe toestemmingen"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Onbekende eigenaar"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Rechten automatisch verbeteren?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Rechten verbeteren"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
#, fuzzy
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
@@ -1418,78 +1492,58 @@ msgstr ""
"Wanneer u de rechten herstelt naar de standaardinstellingen zullen alleen "
"gebruikers met toestemming om de inhoud te lezen toegang tot de map krijgen."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Ja"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Ja op _alles"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Nee"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Annuleren"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Bestandsbeheerder Voorkeuren"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "_Weergavemodi"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Standaard weergavemodus"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "_Nieuwe bestanden bekijken met:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Icoon-weergavemodus"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Gedetailleerde Lijst-weergavemodus"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
#, fuzzy
msgid "Compact List View"
msgstr "Weergeven als _Gedetailleerde lijst"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Laatst Toegepaste Indeling"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "_Mappen voor bestanden sorteren"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Deze optie selecteren om mappen voor bestanden weer te geven wanneer u een "
"map sorteert."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Pictogrammen _weergeven"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1497,11 +1551,11 @@ msgstr ""
"Deze optie selecteren om bestanden met voorproef-mogelijkheid binnen een map "
"als automatisch gegenereerde pictogrammen weer te geven."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Text naast iconen"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1512,63 +1566,63 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
#, fuzzy
msgid "Side Pane"
msgstr "_Zijpaneel"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
#, fuzzy
msgid "Shortcuts Pane"
msgstr "_Sneltoetsen"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
#, fuzzy
msgid "_Icon Size:"
msgstr "Icoongrootte"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Zeer klein"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Kleiner"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Klein"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
#, fuzzy
msgid "Normal"
msgstr "Normale Gr_ootte"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Groot"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Groter"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Zeer groot"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
#, fuzzy
msgid "Show Icon _Emblems"
msgstr "_Embleem iconen weergeven"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
#, fuzzy
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
@@ -1577,22 +1631,22 @@ msgstr ""
"Embleem iconen weergeven in de snelkoppelingenlijst voor alle bestanden "
"waarvoor emblemen zijn ingesteld in het eigenschappenvenster."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
#, fuzzy
msgid "Tree Pane"
msgstr "_Zijpaneel"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
#, fuzzy
msgid "Icon _Size:"
msgstr "Icoongrootte"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
#, fuzzy
msgid "Show Icon E_mblems"
msgstr "_Embleem iconen weergeven"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
#, fuzzy
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
@@ -1604,22 +1658,25 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Gedrag"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "_Eenmaal klikken om mappen of bestanden te openen"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1628,35 +1685,35 @@ msgid ""
"to select the item without activating it."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Dubbelklikken om mappen of bestanden te openen"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Geavanceerd"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
#, fuzzy
msgid "Folder Permissions"
msgstr "Toestemmingen"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1666,180 +1723,185 @@ msgstr ""
"u die veranderingen ook toepassen op\n"
"de inhoud van de folder. Selecteer de standaardoptie hier:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Elke keer vragen"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Alleen op map toepassen"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Toepassen op map en inhoud"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu uur over)"
msgstr[1] "(%lu uur over)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu minuut over)"
msgstr[1] "(%lu minuten over)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(%lu seconde over)"
msgstr[1] "(%lu seconden over)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Algemeen"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Naam:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Type :"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Openen met:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Doel van de Snelkoppeling:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "Bestand _Verwijderen"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Bewerkt:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Geopend:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Grootte:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Volume:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Vrij ruimte: "
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Emblemen"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, fuzzy, c-format
msgid "%s - Properties"
msgstr "_Eigenschappen"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, fuzzy, c-format
msgid "Failed to rename \"%s\""
msgstr "Fout bij het wijzigen van de naam van `%s'"
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Bestand"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Bestand Context Menu"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
#, fuzzy
msgid "_Add Files..."
msgstr "_Geluidsbestanden"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
#, fuzzy
msgid "Include additional files in the list of files to be renamed"
msgstr "Neem andere bestanden op in de lijst van te hernoemen bestanden"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Wissen"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Wis de bestandslijst hieronder"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Over..."
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
#, fuzzy
msgid "Display information about Thunar Bulk Rename"
msgstr "Geef informatie over Thunar weer"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Eigenschappen"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Bekijk de eigenschappen van het geselecteerde bestand"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
#, fuzzy
msgid "Rename Multiple Files"
msgstr "Naam van geselecteerd bestand wijzigen"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
#, fuzzy
msgid "_Rename Files"
msgstr "_Afbeeldingen"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
"Klik hier om de bovengenoemde bestanden te hernoemen naar de nieuwe namen. "
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
#, fuzzy
msgid "New Name"
msgstr "Bestandsbeheerder"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
#, fuzzy
msgid "Click here to view the documentation for the selected rename operation."
msgstr "Klik hier om de rechten van de map automatisch te verbeteren."
@@ -1847,7 +1909,7 @@ msgstr "Klik hier om de rechten van de map automatisch te verbeteren."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1859,34 +1921,34 @@ msgstr ""
"plugin toestaat."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
#, fuzzy
msgid "Select files to rename"
msgstr "Fout bij het wijzigen van de naam van `%s'"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
#, fuzzy
msgid "Audio Files"
msgstr "_Geluidsbestanden"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Afbeeldingen"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
#, fuzzy
msgid "Video Files"
msgstr "_Videobestanden"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
#, fuzzy
msgid "Bulk Rename"
msgstr "Naam _Wijzigen"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1894,14 +1956,14 @@ msgstr ""
"Thunar \"Massaal hernoemen\" is een krachtig en uitbreidbaar\n"
"gereedschap om meerde bestanden tegelijk te hernoemen."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
#, fuzzy
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Afbeeldingen"
msgstr[1] "Afbeeldingen"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
#, fuzzy
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
@@ -1913,7 +1975,7 @@ msgstr[1] ""
"moeten worden."
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Massaal hernoemen - Meerdere bestanden hernoemen"
@@ -1964,290 +2026,276 @@ msgstr[1] ""
"Voeg de geselecteerde mappen toe aan het zijpaneel met snelkoppelingen"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "Schijf _aansluiten"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "Schijf u_itwerpen"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "Schijf l_oskoppelen"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "Snelkoppeling _Verwijderen"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "_Naam Wijzigen van Snelkoppeling"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, fuzzy, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Het pad '%s' verwijst niet naar een map"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Fout bij het toevoegen van nieuwe snelkoppeling"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, fuzzy, c-format
msgid "Failed to eject \"%s\""
msgstr "Fout bij het wijzigen van de naam van `%s'"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, fuzzy, c-format
msgid "Failed to mount \"%s\""
msgstr "Fout bij het wijzigen van de naam van `%s'"
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, fuzzy, c-format
msgid "Failed to unmount \"%s\""
msgstr "Fout bij het wijzigen van de naam van `%s'"
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
#, fuzzy
msgid "Click here to stop calculating the total size of the folder."
msgstr "Klik hier om de rechten van de map automatisch te verbeteren."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
#, fuzzy
msgid "Calculation aborted"
msgstr "Bestanden aan het ophalen..."
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
#, fuzzy
msgid "Calculating..."
msgstr "Bestanden aan het ophalen..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, fuzzy, c-format
msgid "%s Bytes"
msgstr "%s (%u Bytes)"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u item, totaal %s"
msgstr[1] "%u items, totaal %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Map Context Menu"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Maak een lege map in de huidige map"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
#, fuzzy
msgid "Cu_t"
msgstr "Bestand Kn_ippen"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
#, fuzzy
msgid "_Copy"
msgstr "Hier _kopiëren"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
#, fuzzy
msgid "_Paste"
msgstr "Bestanden _Plakken"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr "Verplaats of kopiëer bestanden"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
#, fuzzy
msgid "_Delete"
msgstr "Bestand _Verwijderen"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
msgstr "Plak bestanden naar de geselecteerde map."
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "_Alle Bestanden Selecteren"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Alle bestanden in dit venster selecteren"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "_Op Patroon Selecteren"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Alle bestanden die aan een bepaald patroon voldoen selecteren"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
#, fuzzy
msgid "Du_plicate"
msgstr "Bestand Ver_dubbelen"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Ma_ak Snelkoppeling"
msgstr[1] "Ma_ak Snelkoppelingen"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
#, fuzzy
msgid "_Rename..."
msgstr "Naam _Wijzigen"
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Naam van geselecteerd bestand wijzigen"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Maak _Document"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Inhoud van de map aan het laden..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Nieuw Leeg Bestand"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Nieuwe Leeg Bestand..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Document van sjabloon \"%s\" maken"
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Weet u zeker dat u\n"
-"\"%s\" voorgoed wilt verwijderen?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Weet u zeker dat u\n"
-"het geselecteerde bestand voorgoed wilt verwijderen?"
-msgstr[1] ""
-"Weet u zeker dat u\n"
-"de geselecteerde bestanden voorgoed wilt verwijderen?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Als u een bestand wist, is het voorgoed verloren."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Selecteren op Patroon"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
#, fuzzy
msgid "_Select"
msgstr "Bestand _Verwijderen"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
#, fuzzy
msgid "_Pattern:"
msgstr "Patroon:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, fuzzy, c-format
msgid "Rename \"%s\""
msgstr "Naam _Wijzigen"
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
# Unknown word "fifo"
# Onbekend woord: "fifo"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, fuzzy, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Fout bij het maken van genoemde <fifo> `%s'"
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, fuzzy, c-format
msgid "Failed to open directory \"%s\""
msgstr "Fout bij het openen van de map `%s'"
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
#, fuzzy
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "geselecteerde bestandsnamen (zonder paden)"
msgstr[1] "geselecteerde bestandsnamen (zonder paden)"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "Bereidt het geselecteerde bestand voor om te plakken"
msgstr[1] "Bereidt de geselecteerde bestanden voor om te plakken"
-#: ../thunar/thunar-standard-view.c:3374
+#: ../thunar/thunar-standard-view.c:3349
#, fuzzy
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "De geselecteerde bestanden verwijderen"
-msgstr[1] "De geselecteerde bestanden verwijderen"
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Elk geselecteerde bestand verdubbelen"
+msgstr[1] "Elk geselecteerde bestand verdubbelen"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
#, fuzzy
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Elk geselecteerde bestand verdubbelen"
msgstr[1] "Elk geselecteerde bestand verdubbelen"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
#, fuzzy
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Maak een symbolische snelkoppeling voor elk geselecteerd bestand"
msgstr[1] "Maak een symbolische snelkoppeling voor elk geselecteerd bestand"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Naam van geselecteerd bestand wijzigen"
+msgstr[1] "Naam van geselecteerd bestand wijzigen"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Naam van geselecteerd bestand wijzigen"
+msgstr[1] "Naam van geselecteerd bestand wijzigen"
+
#: ../thunar/thunar-stock.c:57
#, fuzzy
msgid "Create"
@@ -2268,23 +2316,33 @@ msgstr "Geen Sjablonen geïnstalleerd"
msgid "_Empty File"
msgstr "_Leeg Bestand"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
#, fuzzy
msgid "Loading..."
msgstr "Aan het voorbereiden..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
#, fuzzy
msgid "_Paste Into Folder"
msgstr "Bestanden in Map Plakken"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
#, fuzzy
msgid "P_roperties..."
msgstr "_Eigenschappen"
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Nieuw _Venster Openen"
@@ -2727,26 +2785,25 @@ msgid "Shutter Speed:"
msgstr ""
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
#, fuzzy
msgid "Image"
msgstr "Afbeeldingen"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
#, fuzzy
msgid "Image Type:"
msgstr "Afbeeldingen"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-#, fuzzy
-msgid "Image Size:"
-msgstr "Afbeeldingen"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2929,39 +2986,39 @@ msgstr "Ongeldige reguliere expressie bij %ld: %s "
msgid "Search & Replace"
msgstr "Zoeken & Vervangen"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2971,30 +3028,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "Bestanden aan het kopiëren..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "Fout bij het maken van map `%s'"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Fout bij het maken van symbolische snelkoppeling `%s'"
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -3002,7 +3059,7 @@ msgstr[0] "Fout bij het openen van het %dste bestand."
msgstr[1] "Fout bij het openen van het %dste bestand."
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "Fout bij het openen van het %dste bestand."
@@ -3011,6 +3068,33 @@ msgstr "Fout bij het openen van het %dste bestand."
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Fout bij het veranderen van de modus van `%s'"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Alternatieve Acties"
@@ -3253,11 +3337,11 @@ msgstr "Eind element behandelaar die aangeroepen wordt in beheerders-context"
msgid "Unknown closing element <%s>"
msgstr "Onbekend sluit-element <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Fout bij het bepalen van de opslaglocatie voor uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Commando niet ingesteld"
@@ -3311,3 +3395,101 @@ msgstr "Nieuwe Map"
#, fuzzy
msgid "Open the specified folders in Thunar"
msgstr "De geselecteerde mappen in nieuwe Thunar-vensters openen"
+
+#, fuzzy
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "De geselecteerde bestanden verwijderen"
+#~ msgstr[1] "De geselecteerde bestanden verwijderen"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Het veranderen van de toestemmingen van `%s' is mislukt: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Wilt u dit bestand overslaan?"
+
+#, fuzzy
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Het definieren van bestandsinfo `%s' is mislukt: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "Het bestand `%s' bestaat al. Wilt u dit vervangen door een leeg bestand?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Fout bij het verwijderen van %s.\n"
+#~ "\n"
+#~ "Wilt u het overslaan?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Fout bij het maken van leeg bestand %s.\n"
+#~ "\n"
+#~ "Wilt u deze stap overslaan?"
+
+# Unknown word "stat"
+# Obekend woord: "stat"
+#, fuzzy
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Het <stat> van bestand `%s' is mislukt: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Wilt u dit bestand overschrijven?"
+
+#, fuzzy
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Fout bij het maken van map `%s'"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Mappen aan het verwijderen..."
+
+#, fuzzy
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Fout bij het verwijderen van de map `%s' : %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Kan de hoofdmap niet verplaatsen"
+
+#, fuzzy
+#~ msgid "Named pipes are not supported"
+#~ msgstr "In daemon modus draaien"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Actie geannulleerd"
+
+#, fuzzy
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Fout bij het lezen van snelkopplingsdoel `%s'"
+
+#, fuzzy
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Fout bij het veranderen van de modus van `%s'"
+
+#, fuzzy
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Fout bij het kopiëren van speciaal bestand `%s'"
diff --git a/po/pl.po b/po/pl.po
index e07db5c474742a5d312a0a7c831f2616e6c7e47e..5410ff01df9489397fba17ad871f3efc8f3f4d82 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-06-15 21:01+0200\n"
"Last-Translator: Szymon Kałasz <szymon_maestro@gazeta.pl>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -19,279 +19,139 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n%"
"100<10 || n%100>=20)) ? 1 : 2));\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "WyszukujÄ™ pliki..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Czy chcesz go pominąć?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Nie udało się ustalić informacji o pliku \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Nie udało się zmienić praw dostępu do \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Nie udało się zmienić właściciela dla \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Nie udało się zmienić grupy dla \"%s\": %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Plik \"%s\" już istnieje. Czy zastąpić go przez pusty plik?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Nie można usunąć \"%s\".\n"
-"\n"
-"Czy chcesz go pominąć?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Nie można usunąć \"%s\".\n"
-"\n"
-"Czy chcesz go pominąć?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Błąd odczytu zawartości folderu"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Nieznany błąd"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Nie wybrano pola Exec"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Nie wybrano pola URL"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Nieprawidłowy plik .desktop"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Nie mogę parsować pliku"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Nieprawidłowa nazwa pliku"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Nie mogę odczytać atrybutów pliku \"%s\": %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Czy chcesz go nadpisać?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Nie udało się usunąć pliku \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Nie udało się wczytać aplikacji z pliku %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Polecenie"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "Polecenie do wykonania dla typu mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Flagi"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Flagi dla typu mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Ikona"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Wybierz pliki do zmiany nazwy"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "Ikona dla typu mime"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "PrzygotowujÄ™..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nazwa"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Nie udało się zmienić praw dostępu do \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Nazwa typu mime"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Nie udało się zmienić właściciela dla \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "dokument %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Nie udało się zmienić grupy dla \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Nie udało się utworzyć katalogu \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Ścieżka jest zbyt długa"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "Identyfikator URI jest zbyt długi"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Rozmiar"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Rozmiar miniaturki"
+msgid "The file \"%s\" already exists"
+msgstr "Plik \"%s\" już istnieje"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Usuwam katalogi..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Nie udało się utworzyć kolejki FIFO \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Nie można usunąć katalogu \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Nie mogę przenieść katalogu głównego"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "PrzygotowujÄ™..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Nie można otworzyć \"%s\" do odczytu"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Nieprawidłowa ścieżka"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Nie można otworzyć \"%s\" do zapisu"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Nieznany użytkownik \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "BÅ‚Ä…d zapisu do pliku \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Nie udało się określić punktu montowania dla %s"
+msgid "Failed to remove \"%s\""
+msgstr "Nie udało się usunąć \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Nie można połączyć się z daemonem HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "BÅ‚Ä…d odczytu z pliku \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "kopia %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "Å‚Ä…cze do %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "druga kopia %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "drugie Å‚Ä…cze do %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "trzecia kopia %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "trzecie Å‚Ä…cze do %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
@@ -299,7 +159,7 @@ msgstr[0] "%u. kopia %s"
msgstr[1] "%u. kopia %s"
msgstr[2] "%u. kopia %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
@@ -307,87 +167,185 @@ msgstr[0] "%u. Å‚Ä…cze do %s"
msgstr[1] "%u. Å‚Ä…cze do %s"
msgstr[2] "%u. Å‚Ä…cze do %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Nie udało się odczytać atrybutów pliku \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Nie udało się utworzyć katalogu \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Nie udało się utworzyć kolejki FIFO \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Nazwane rurki nie sÄ… wspierane"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Nie można otworzyć \"%s\" do odczytu"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Nie udało się utworzyć dowiązania symbolicznego \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Plik \"%s\" już istnieje"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Nie można otworzyć \"%s\" do zapisu"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "DowiÄ…zania symboliczne nie sÄ… wspierane"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "BÅ‚Ä…d odczytu z pliku \"%s\""
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "System plików"
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Nie udało się zmienić nazwy \"%s\" na \"%s\"."
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Nie udało się zmienić nazwy \"%s\" na \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Nie udało się zmienić nazwy \"%s\" na \"%s\"."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Ścieżka \"%s\" nie wskazuje na katalog"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "BÅ‚Ä…d zapisu do pliku \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "Nie udało się wczytać aplikacji z pliku %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Nie udało się usunąć \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "Nie udało się usunąć pliku \"%s\": %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Operacja anulowana"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Polecenie"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Nie można odczytać obiektu, na który wskazuje \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "Polecenie do wykonania dla typu mime"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Flagi"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Flagi dla typu mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Ikona"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "Ikona dla typu mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nazwa"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Nazwa typu mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Nie udało się utworzyć dowiązania symbolicznego \"%s\""
+msgid "%s document"
+msgstr "dokument %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Nie udało się zmienić praw dostępu do \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "DowiÄ…zania symboliczne nie sÄ… wspierane"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Ścieżka jest zbyt długa"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "Identyfikator URI jest zbyt długi"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Rozmiar"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Rozmiar miniaturki"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "WyszukujÄ™ pliki..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Nieprawidłowa ścieżka"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Nie udało się odczytać atrybutów pliku \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "Nieznany użytkownik \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Nie udało się skopiować pliku specjalnego \"%s\""
+msgid "Failed to determine the mount point for %s"
+msgstr "Nie udało się określić punktu montowania dla %s"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Nie można połączyć się z daemonem HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -504,58 +462,143 @@ msgid "Sort items in descending order"
msgstr "Sortuj elementy w porzÄ…dku malejÄ…cym"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Nie udało się uruchomić operacji"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Nie udało się otworzyć \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Nie udało się otworzyć \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Kopiowanie plików..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Tworzenie dowiązań..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Przenoszenie plików..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Przenoszenie plików..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr "Czy na pewno chcesz trwale usunąć \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] "Czy na pewno chcesz trwale usunąć wybrany plik?"
+msgstr[1] "Czy na pewno chcesz trwale usunąć wybrane pliki?"
+msgstr[2] "Czy na pewno chcesz trwale usunąć wybrane pliki?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Jeśli usuniesz plik, nie będzie można go odzyskać."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Usuwanie plików..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "TworzÄ™ pliki..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "TworzÄ™ katalogi..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "_Pusty plik"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Nie udało się określić punktu montowania dla %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Stwórz nowy folder w \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Stwórz _Folder..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Nie udało się usunąć \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Usuwanie plików..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Nie udało się ustawić domyślnej aplikacji dla \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Nie wybrano aplikacji"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -564,80 +607,78 @@ msgstr ""
"\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Inna aplikacja..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Otwórz za pomocą"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Użyj polecenia użytkownika:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
msgstr "Użyj własnego polecenia"
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_PrzeglÄ…daj..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Ustaw jako _domyślne dla tego typu plików"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Nie udało się dodać aplikacji \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Nie udało się uruchomić \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "_Usuń wyzwalacz"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Otwieraj <i>%s</i> i inne pliki typu \"%s\" używając:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
msgstr ""
"Przeglądaj system w celu wybrania aplikacji obsługującej pliki typu \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr "Zmień domyślną aplikację dla plików typu \"%s\" na wybraną."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Czy na pewno chcesz usunąć \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -650,39 +691,39 @@ msgstr ""
"Możesz usuwać tylko aktywatory utworzone opcją \"Użyj polecenia użytkownika"
"\" w oknie dialogowym \"Otwórz za pomocą innej aplikacji\"."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Wybierz aplikacjÄ™"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Wszystkie pliki"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Pliki wykonywalne"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Skrypty języka Perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Skrypty języka Python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Skrypty języka Ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Skrypty powłoki"
@@ -702,7 +743,7 @@ msgid "Other Applications"
msgstr "Inne aplikacje"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "W schowku nie ma nic do wklejenia"
@@ -769,14 +810,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "_Skaluj kolumny"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Nieznany"
@@ -788,7 +830,7 @@ msgstr "Listowanie kompaktowe"
msgid "Compact view"
msgstr "Widok oszczędny"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Podaj nowÄ… nazwÄ™:"
@@ -814,7 +856,7 @@ msgstr "Pokazuj szczegóły elementów w katalogu"
msgid "Details view"
msgstr "Widok szczegółowy"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr ""
"Piotr Maliński <admin@rk.edu.pl> \n"
@@ -823,10 +865,26 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Nie udało się uruchomić przeglądarki dokumentacji"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Tak"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Tak dla _wszystkich"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Nie"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Anuluj"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "S_kopiuj"
@@ -881,7 +939,7 @@ msgstr "Właściciel"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Prawa dostępu"
@@ -897,14 +955,10 @@ msgstr "Plik"
msgid "File Name"
msgstr "Nazwa pliku"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Katalog główny nie ma katalogu nadrzędnego"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "System plików"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -938,14 +992,14 @@ msgstr "Widok ikon"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Otwórz"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Otwórz w nowym oknie"
@@ -1091,12 +1145,12 @@ msgstr[0] "Wyślij zaznaczony plik do \"%s\""
msgstr[1] "Wyślij zaznaczone pliki do \"%s\""
msgstr[2] "Wyślij zaznaczone pliki do \"%s\""
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "nieprawidłowe łącze"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1105,7 +1159,7 @@ msgstr[1] "%d elementy (%s), dostępna przestrzeń: %s"
msgstr[2] "%d elementów (%s), dostępna przestrzeń: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
@@ -1113,7 +1167,7 @@ msgstr[0] "%d element, dostępna przestrzeń: %s"
msgstr[1] "%d elementy, dostępna przestrzeń: %s"
msgstr[2] "%d elementów, dostępna przestrzeń: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
@@ -1121,22 +1175,36 @@ msgstr[0] "%d element"
msgstr[1] "%d elementy"
msgstr[2] "%d elementów"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" nieprawidłowe łącze"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) odnosi siÄ™ do %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Wymiary obrazu:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
@@ -1144,7 +1212,7 @@ msgstr[0] "%d zaznaczony element (%s)"
msgstr[1] "%d zaznaczone elementy (%s)"
msgstr[2] "%d zaznaczonych elementów (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
@@ -1152,40 +1220,44 @@ msgstr[0] "%d zaznaczony element"
msgstr[1] "%d zaznaczone elementy"
msgstr[2] "%d zaznaczonych elementów"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Odstęp"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Odstęp pomiędzy przyciskami elementów ścieżki"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Otwórz \"%s\" w tym oknie"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Otwórz \"%s\" w nowym oknie"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Stwórz nowy folder w \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Stwórz _Folder..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1193,29 +1265,29 @@ msgstr ""
"Przenieś lub Kopiuj pliki zaznaczone wcześniej przez polecenie Kopiuj lub "
"Wytnij do \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Wklej do katalogu"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Wyświetl właściwości zaznaczonego folderu \"%s\""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Właściwości"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Nowy Katalog"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Stwórz Nowy Katalog"
@@ -1232,11 +1304,11 @@ msgstr "Położenie:"
msgid "Failed to launch \"%s\""
msgstr "Nie udało się uruchomić \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Rozmiar ikony"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Rozmiar ikony dla elementów ścieżki"
@@ -1318,17 +1390,15 @@ msgid "Stop applying permissions recursively."
msgstr "Zatrzymaj rekursywne nakładanie uprawnień"
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Pytanie"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Nakładaj rekursywnie?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
@@ -1336,11 +1406,11 @@ msgstr ""
"Czy chcesz zastosować zmiany rekursywnie dla\n"
"wszystkich plików i podkatalogów wewnątrz zaznaczonego katalogu?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Nie pytaj ponownie"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1350,29 +1420,29 @@ msgstr ""
"Można zmieniać tą opcję w ustawieniach."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Nie udało się zmienić grupy"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Nie udało się zmienić uprawnień"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Nieznany właściciel"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Automatycznie poprawiać prawa katalogów?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Poprawianie uprawnień katalogów"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1381,75 +1451,55 @@ msgstr ""
"Ustawia uprawnienia do katalogu na normalne. Tylko użytkownicy mogący czytać "
"zawartość katalogu będą mogły wejść do niego."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Tak"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Tak dla _wszystkich"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Nie"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Anuluj"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Ustawienia Menadżera Plików"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Widoki"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Widok Domyślny"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Zobacz _nowe foldery za pomocÄ…:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Widok ikon"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Widok szczegółowy"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Widok kompaktowy"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Ostatnio Aktywne"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Sortuj _foldery przed plikami"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr "Wybierz tą opcję by listować foldery przed plikami."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "_Pokaż miniatury"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1457,11 +1507,11 @@ msgstr ""
"Zaznacz tą opcję by otrzymać miniatury z zawartością plików o możliwym "
"podglÄ…dzie."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Tekst po środku ikon"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1470,58 +1520,58 @@ msgstr "Wybierz tą opcję by tekst był wyświetlany pośrodku."
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Panel boczny"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Panel Skrótów"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "Rozmiar _ikon:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Bardzo mały"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Mniejszy"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Mały"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normalny"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Duży"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Większy"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Bardzo Duży"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Pokazuj _Emblematy ikon"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1529,19 +1579,19 @@ msgstr ""
"Wybierz opcję by wyświetlać emblematy w panelu skrótów dla wszystkich "
"folerów, dla których emblematy zostały zdefiniowane."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Panel Drzewa"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "_Rozmiar ikon:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Pokazuj E_mblematy Ikon"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1552,16 +1602,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Zachowanie"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "_Pojedyncze kliknięcie aktywuje"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1569,7 +1622,7 @@ msgstr ""
"Podaj _opóźnienie po jakim element zostanie zaznaczony\n"
"przez stojÄ…cy nad nim kursor myszy"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1580,34 +1633,34 @@ msgstr ""
"Przy pojedynczym kliknięciu zatrzymanie kursora myszy nad elementem "
"automatycznie zaznaczy go po upływie ustawionego czasu."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Wyłączone"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Åšredni"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "DÅ‚ugi"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Podwójne kliknięcie aktywuje"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Zaawansowane"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Prawa dostępu katalogów"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1617,19 +1670,19 @@ msgstr ""
"można robić to też dla ich zawartości. Wybierz\n"
"zachowanie, jakie odpowiada ci najbardziej:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Pytaj zawsze"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Tylko dla folderów"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Dla folderów i zawartości"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1637,7 +1690,7 @@ msgstr[0] "(pozostała %lu godzina)"
msgstr[1] "(pozostały %lu godziny)"
msgstr[2] "(pozostało %lu godzin)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1645,7 +1698,7 @@ msgstr[0] "(pozostała %lu minuta)"
msgstr[1] "(pozostały %lu minuty)"
msgstr[2] "(pozostało %lu minut)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1653,147 +1706,152 @@ msgstr[0] "(pozostała %lu sekunda)"
msgstr[1] "(pozostały %lu sekundy)"
msgstr[2] "(pozostało %lu sekund)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Ogólne"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Nazwa:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Typ:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Otwórz z:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Cel dowiÄ…zania:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Usuń"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Ostatnio zmodyfikowany:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Ostatnio otwarty:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Rozmiar:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "UrzÄ…dzenie:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Wolne Miejsce:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Emblematy"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Właściwości"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Nie udało się zmienić nazwy \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Plik"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "W_yślij do"
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Menu kontekstowe pliku"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Dodaj pliki"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Dołącz dodatkowe pliki do listy plików przeznaczonych do zmiany nazwy"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Wyczyść"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Czyści listę plików"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "O progr_amie"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Wyświetl informacje o Zmieniaczu Nazw Thunara"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Właściwości..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Wyświetl właściwości zaznaczonego elementu"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Zmień nazwę wielu plików"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "Zmień nazwę plików"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "Kliknij tutaj by zmienić nazwy plików listowanych powyżej."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Nowa Nazwa"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr "Kliknij tutaj by zobaczyć dokumentację wybranej operacji zmiany nazwy."
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1805,30 +1863,30 @@ msgstr ""
"obsługę wtyczki \"Simple Builtin Renamers\"."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Wybierz pliki do zmiany nazwy"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Pliki Audio"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Pliki Graficzne"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Pliki Wideo"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Zmień nazwę"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1836,14 +1894,14 @@ msgstr ""
"Thunar Bulk Rename jest potężnym i elastycznym\n"
"narzędziem do masowej zmiany nazw plików."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Usuń Plik"
msgstr[1] "Usuń Pliki"
msgstr[2] "Usuń Pliki"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Usuń zaznaczony plik z listy plików przeznaczonych do zmiany nazwy"
@@ -1851,7 +1909,7 @@ msgstr[1] "Usuń zaznaczone pliki z listy plików przeznaczonych do zmiany nazwy
msgstr[2] "Usuń zaznaczone pliki z listy plików przeznaczonych do zmiany nazwy"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Bulk Rename - Zmień nazwy wielu plików"
@@ -1899,80 +1957,80 @@ msgstr[1] "Dodaj zaznaczone foldery do panelu skrótów"
msgstr[2] "Dodaj zaznaczone foldery do panelu skrótów"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Zamontuj"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "_Wysuń"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_Odmontuj"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_Usuń skrót"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Zmień _nazwę skrótu"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Ścieżka \"%s\" nie wskazuje na katalog"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Nie udało się dodać nowego skrótu"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Nie udało się wysunąć \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Nie udało się zamontować \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Nie udało się odmontować \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Kliknij tutaj by zaprzestać obliczania rozmiary folderu."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Obliczanie przerwane"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Obliczam..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s bajtów"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
@@ -1980,40 +2038,40 @@ msgstr[0] "%u elementów, sumuję %s"
msgstr[1] "%u elementów, sumuję %s"
msgstr[2] "%u elementów, sumuję %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Menu kontekstowe katalogu"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Utwórz pusty folder w bieżącym folderze"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "_Wytnij"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Kopiuj"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "Wk_lej"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Przenieś lub skopiuj pliki zaznaczone wcześniej przez polecenie Wytnij lub "
"Kopiuj"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Usuń"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2021,123 +2079,100 @@ msgstr ""
"Przenieś lub skopiuj pliki wybrane wcześniej przez polecenie Wytnij lub "
"Kopiuj do zaznaczonego folderu"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Zaznacz wszystkie pliki"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Zaznacz wszystkie pliki w tym katalogu"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Zaznacz _według wzorca..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Zaznacz wszystkie pliki pasujÄ…ce do wzorca"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Z_duplikuj"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Utwórz _łącze"
msgstr[1] "Utwórz _łącza"
msgstr[2] "Utwórz _łącza"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "Zmień _nazwę..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Zmień nazwę zaznaczonego pliku"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Stwórz _Dokument"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Wczytuję zawartość katalogu..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Nowy pusty plik"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Nowy pusty plik..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Stwórz Dokument z szablonu \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr "Czy na pewno chcesz trwale usunąć \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] "Czy na pewno chcesz trwale usunąć wybrany plik?"
-msgstr[1] "Czy na pewno chcesz trwale usunąć wybrane pliki?"
-msgstr[2] "Czy na pewno chcesz trwale usunąć wybrane pliki?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Jeśli usuniesz plik, nie będzie można go odzyskać."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Zaznacz według wzorca"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Zaznacz"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Wzorzec:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Zmień nazwę \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "Nieprawidłowa nazwa pliku dostarczona przez źródło XDS"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Nie udało się utworzyć łącza do URLa \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Nie udało się otworzyć katalogu \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] ""
@@ -2147,34 +2182,51 @@ msgstr[1] ""
msgstr[2] ""
"Przygotuj zaznaczone pliki do przeniesienia za pomocÄ… polecenia Wklej"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "Przygotuj zaznaczony plik do skopiowania za pomocÄ… polecenia Wklej"
msgstr[1] "Przygotuj zaznaczone pliki do skopiowania za pomocÄ… polecenia Wklej"
msgstr[2] "Przygotuj zaznaczone pliki do skopiowania za pomocÄ… polecenia Wklej"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Usuń zaznaczony plik"
-msgstr[1] "Usuń zaznaczone pliki"
-msgstr[2] "Usuń zaznaczone pliki"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Zduplikuj zaznaczony plik"
+msgstr[1] "Zduplikuj wszystkie zaznaczone pliki"
+msgstr[2] "Zduplikuj wszystkie zaznaczone pliki"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Zduplikuj zaznaczony plik"
msgstr[1] "Zduplikuj wszystkie zaznaczone pliki"
msgstr[2] "Zduplikuj wszystkie zaznaczone pliki"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Utwórz dowiązanie do zaznaczonego pliku"
msgstr[1] "Utwórz dowiązania do wszystkich zaznaczonych plików"
msgstr[2] "Utwórz dowiązania do wszystkich zaznaczonych plików"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Zmień nazwę zaznaczonego pliku"
+msgstr[1] "Zmień nazwę zaznaczonego pliku"
+msgstr[2] "Zmień nazwę zaznaczonego pliku"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Zmień nazwę zaznaczonego pliku"
+msgstr[1] "Zmień nazwę zaznaczonego pliku"
+msgstr[2] "Zmień nazwę zaznaczonego pliku"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Stwórz"
@@ -2193,20 +2245,30 @@ msgstr "Brak Szablonów"
msgid "_Empty File"
msgstr "_Pusty plik"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Åadowanie..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "_Wklej pliki do katalogu"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "_Właściwości..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Otwórz nowe _okno"
@@ -2628,23 +2690,23 @@ msgid "Shutter Speed:"
msgstr "Szybkość migawki:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Oprogramowanie:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Obraz"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Typ obrazu:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Wymiary obrazu:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2820,21 +2882,21 @@ msgstr "Niepoprawne wyrażenie regularne na pozycji %ld: %s"
msgid "Search & Replace"
msgstr "Znajdź i zamień"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "Wysłać \"%s\" jako skompresowane archiwum?"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "Wyślij _bezpośrednio"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "Wyślij _skompresowane"
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
@@ -2844,7 +2906,7 @@ msgstr ""
"bezpośrednio (tak jak jest), czy skompresować go przed dołączaniem do "
"wiadomości. Zaleca się kompresowanie dużych plików przed wysłaniem."
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
@@ -2852,11 +2914,11 @@ msgstr[0] "Wysłać %d plik w skompresowanym archiwum?"
msgstr[1] "Wysłać %d pliki w skompresowanym archiwum?"
msgstr[2] "Wysłać %d plików w skompresowanym archiwum?"
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "Wyślij jako a_rchiwum"
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2870,28 +2932,28 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "Kompresowanie plików..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "Polecenie ZIP zakończyło się z błędem %d"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr "Nie udało się utworzyć katalogu tymczasowego"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Nie udało się utworzyć dowiązania symbolicznego dla \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2900,7 +2962,7 @@ msgstr[1] "Nie udało się skompresować %d plików"
msgstr[2] "Nie udało się skompresować %d plików"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "Nie udało się utworzyć nowej wiadomości e-mail"
@@ -2908,6 +2970,33 @@ msgstr "Nie udało się utworzyć nowej wiadomości e-mail"
msgid "Mail Recipient"
msgstr "Odbiorca poczty elektronicznej"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Nie można połączyć się z daemonem HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Akcje"
@@ -3139,11 +3228,11 @@ msgstr "Funkcja obsługi elementu zamykającego wywołana z głównego kontekstu
msgid "Unknown closing element <%s>"
msgstr "Nieznany element zamykajÄ…cy <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Nie udało się określić miejsca zapisu dla uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Polecenie nieskonfigurowane"
@@ -3192,3 +3281,87 @@ msgstr "Otwórz folder za pomocą Thunara"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Otwórz wybrane katalogi w Thunarze"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Usuń zaznaczony plik"
+#~ msgstr[1] "Usuń zaznaczone pliki"
+#~ msgstr[2] "Usuń zaznaczone pliki"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Nie udało się zmienić praw dostępu do \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Czy chcesz go pominąć?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Nie udało się ustalić informacji o pliku \"%s\": %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "Plik \"%s\" już istnieje. Czy zastąpić go przez pusty plik?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Nie można usunąć \"%s\".\n"
+#~ "\n"
+#~ "Czy chcesz go pominąć?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Nie można usunąć \"%s\".\n"
+#~ "\n"
+#~ "Czy chcesz go pominąć?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Nie mogę odczytać atrybutów pliku \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Czy chcesz go nadpisać?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Nie udało się utworzyć katalogu \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Usuwam katalogi..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Nie można usunąć katalogu \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Nie mogę przenieść katalogu głównego"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Nazwane rurki nie sÄ… wspierane"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Operacja anulowana"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Nie można odczytać obiektu, na który wskazuje \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Nie udało się zmienić praw dostępu do \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Nie udało się skopiować pliku specjalnego \"%s\""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 128d8adc781a9eda84a4b4b6cede1a200737fe47..c4af06d81e605c78dd2907d25458681c52edd511 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-06-04 15:12-0300\n"
"Last-Translator: Adriano Winter Bess <awbess@gmail.com>\n"
"Language-Team: os-cillation <info@os-cillation.com>\n"
@@ -18,373 +18,331 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Coletando arquivos..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Você quer pulá-lo?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Falhou ao determinar informações do arquivo \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Falhou ao trocar permissões de \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Falhou ao trocar dono de \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Falhou ao trocar grupo de \"%s\": %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "O arquivo \"%s\" já existe. Deseja substituÃ-lo com um arquivo vazio?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Falhou ao remover %s.\n"
-"\n"
-"Você quer pulá-lo?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Falhou ao criar arquivo vazio \"%s\".\n"
-"\n"
-"Você quer pulá-lo?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Falhou ao ler o conteúdo da pasta"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Erro desconhecido"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Nenhum campo Exec especificado"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Nenhum campo URL especificado"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Arquivo de área de trabalho inválido"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Falhou ao interpretar o arquivo"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Nome de arquivo inválido"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Falhou ao obter status do arquivo \"%s\": %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Você quer sobrescrevê-lo?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Falhou ao remover \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Falhou ao carregar aplicação do arquivo %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Comando"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "O comando para executar o tratador mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Opções"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "As opções para o tratador mime"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Ãcone"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Selecione arquivos para renomear"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "O Ãcone do tratador mime"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Preparando..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nome"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Falhou ao trocar permissões de \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "O nome do tratador mime"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Falhou ao trocar dono de \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "Documento %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Falhou ao trocar grupo de \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Falhou ao criar o diretório \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Caminho longo demais para caber no buffer"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI longo demais para caber no buffer"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Tamanho"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "O tamanho de miniatura desejado"
+msgid "The file \"%s\" already exists"
+msgstr "O arquivo \"%s\" já existe"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Removendo diretórios..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Falhou ao criar \"fifo\" nomeado \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Falhou ao remover o diretório \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Não é possÃvel transferir o diretório raiz"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Preparando..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Falhou ao abrir \"%s\" para leitura"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Caminho inválido"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Falhou ao abrir \"%s\" para escrita"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Usuário desconhecido \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "Falhou ao escrever dados em \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Falhou ao determinar o ponto de montagem para %s"
+msgid "Failed to remove \"%s\""
+msgstr "Falhou ao remover \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Falhou ao conectar ao servidor HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Falhou ao ler dados de \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "cópia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "ligação para %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "outra cópia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "outra ligação para %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "terceira cópia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "terceira ligação para %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%uª cópia de %s"
msgstr[1] "%uª cópia de %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%uª ligação para %s"
msgstr[1] "%uª ligação para %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Falhou ao determinar informação de arquivo para \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Falhou ao criar o diretório \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Falhou ao criar \"fifo\" nomeado \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "\"Pipes\" nomeados não são suportados"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Falhou ao abrir \"%s\" para leitura"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Falhou ao criar ligação simbólica \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "O arquivo \"%s\" já existe"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Falhou ao abrir \"%s\" para escrita"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Ligações simbólicas não são suportadas"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Falhou ao ler dados de \"%s\""
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Sistema de Arquivos"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Falhou ao renomear \"%s\" para \"%s\"."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Falhou ao renomear \"%s\" para \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Falhou ao renomear \"%s\" para \"%s\"."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "O caminho \"%s\" não se refere a um diretório"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Falhou ao escrever dados em \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "Falhou ao carregar aplicação do arquivo %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Falhou ao remover \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "Falhou ao remover \"%s\": %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Operação cancelada"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Comando"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Falhou ao ler alvo da ligação de \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "O comando para executar o tratador mime"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Opções"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "As opções para o tratador mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Ãcone"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "O Ãcone do tratador mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nome"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "O nome do tratador mime"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Falhou ao criar ligação simbólica \"%s\""
+msgid "%s document"
+msgstr "Documento %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Falhou ao trocar modo de \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Ligações simbólicas não são suportadas"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Caminho longo demais para caber no buffer"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI longo demais para caber no buffer"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Tamanho"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "O tamanho de miniatura desejado"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Coletando arquivos..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Caminho inválido"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Falhou ao determinar informação de arquivo para \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "Usuário desconhecido \"%s\""
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "Falhou ao determinar o ponto de montagem para %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Falhou ao copiar arquivo especial \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Falhou ao conectar ao servidor HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -501,58 +459,148 @@ msgid "Sort items in descending order"
msgstr "Ordenar itens em ordem descendente"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Falhou ao lançar operação"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Falhou ao abrir \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Falhou ao abrir \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Copiando arquivos..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Criando ligações simbólicas..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Movendo arquivos..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Movendo arquivos..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Você tem certeza que deseja\n"
+"remover permanentemente \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Você tem certeza que quer remover\n"
+"permanentemente o arquivo selecionado?"
+msgstr[1] ""
+"Você tem certeza que quer remover\n"
+"permanentemente os %u arquivos selecionados?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Se você deletar um arquivo, ele é permanentemente perdido."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Removendo arquivos..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Criando arquivos..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Criando diretórios..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Arquivo _Vazio"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Falhou ao determinar o ponto de montagem para %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Criar uma nova pasta em \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Criar _Pasta..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Falhou ao remover \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Removendo arquivos..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Falhou ao configurar aplicação padrão para \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Nenhuma aplicação selecionada"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -561,20 +609,20 @@ msgstr ""
"\"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Outra Aplicação..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Abrir Com"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Use um _comando personalizado:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -583,40 +631,39 @@ msgstr ""
"lista de aplicações acima."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Navegar..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Usar como pa_drão para este tipo de arquivo"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Falhou ao adicionar nova aplicação \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Falhou ao executar \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "_Remover Lançador"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Abrir <i>%s</i> e outros arquivos do tipo \"%s\" com:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -624,8 +671,7 @@ msgstr ""
"Navegar pelo sistema de arquivos para selecionar uma aplicação para abrir "
"arquivos do tipo \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -634,12 +680,12 @@ msgstr ""
"Mudar a aplicação padrão para arquivos do tipo \"%s\" para a aplicação "
"selecionada."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Você tem certeza que deseja remover \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -654,39 +700,39 @@ msgstr ""
"caixa de comando personalizado no diálogo \"Abrir Com\" do gerenciador de "
"arquivos."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Selecione uma Aplicação"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Todos os Arquivos"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Arquivos Executáveis"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Scripts de Perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Scripts de Python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Scripts de Ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Scripts de Shell"
@@ -706,7 +752,7 @@ msgid "Other Applications"
msgstr "Outras Aplicações"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Não há nada na área de transferência para colar"
@@ -775,14 +821,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "_Expandir automaticamente as colunas quando necessário"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Desconhecido"
@@ -794,7 +841,7 @@ msgstr "Listagem de diretório compacta"
msgid "Compact view"
msgstr "Visualização compacta"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Entre com o novo nome:"
@@ -821,16 +868,32 @@ msgstr "Listagem de diretório detalhada"
msgid "Details view"
msgstr "Visualização de detalhes"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "Créditos de tradutores"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Falhou ao abrir o navegador da documentação"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Sim"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Sim para _todos"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Não"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Cancelar"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Copiar aqui"
@@ -885,7 +948,7 @@ msgstr "Dono"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Permissões"
@@ -901,14 +964,10 @@ msgstr "Arquivo"
msgid "File Name"
msgstr "Nome do Arquivo"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "A pasta raiz não tem pai"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Sistema de Arquivos"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -943,14 +1002,14 @@ msgstr "Visualização de Ãcone"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Abrir"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Abrir em Nova Janela"
@@ -1086,12 +1145,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Abrir os arquivos selecionados"
msgstr[1] "Abrir os arquivos selecionados"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "ligação quebrada"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1099,83 +1158,101 @@ msgstr[0] "%d item (%s), espaço livre: %s"
msgstr[1] "%d itens (%s), espaço livre: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d item, espaço livre: %s"
msgstr[1] "%d itens, espaço livre: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d item"
msgstr[1] "%d itens"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "ligação quebrada \"%s\""
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) ligação para %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Tamanho da Imagem:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d item selecionado (%s)"
msgstr[1] "%d itens selecionados (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d item selecionado"
msgstr[1] "%d itens selecionados"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Espaçamento"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "A quantidade de espaço entre os botões de caminho"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Abrir \"%s\" nesta janela"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Abrir \"%s\" em uma nova janela"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Criar uma nova pasta em \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Criar _Pasta..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1183,29 +1260,29 @@ msgstr ""
"Mover ou copiar arquivos previamente selecionados por um comando Recortar ou "
"Copiar para \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Colar Dentro da Pasta"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Visualizar as propriedades da pasta \"%s\""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Propriedades"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Nova Pasta"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Criar Nova Pasta"
@@ -1222,11 +1299,11 @@ msgstr "_Endereço:"
msgid "Failed to launch \"%s\""
msgstr "Falhou ao executar \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Tamanho de Ãcone"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "O tamanho de Ãcone para a entrada de caminho"
@@ -1308,17 +1385,15 @@ msgid "Stop applying permissions recursively."
msgstr "Pare de aplicar permissões recursivamente."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Questão"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Aplicar recursivamente?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1327,11 +1402,11 @@ msgstr ""
"Você deseja aplicar as mudanças recursivamente para\n"
"todos os arquivos ou subpastas dentro da pasta selecionada?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Não pergunte novamente"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1342,29 +1417,29 @@ msgstr ""
"preferências mais tarde."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Falha em mudar grupo"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Falha ao aplicar as novas permissões"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Dono de arquivo desconhecido"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Corrigir as permissões de pasta automaticamente?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Corrigir as permissões de pasta"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1374,77 +1449,57 @@ msgstr ""
"usuários com permissão para ler o conteúdo desta pasta terão permissão para "
"entrar na pasta após isto."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Sim"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Sim para _todos"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Não"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Preferências de Gerenciador de Arquivo"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Visualizações"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Visualização Padrão"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Visualizar _novas pastas usando:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Visualização de Ãcone"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Visualização de Lista Detalhada"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Visualização de Lista Compacta"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Última Visualização Ativa"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Ordenar _pastas antes dos arquivos"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Selecione esta opção para listar pastas antes dos arquivos quando você "
"ordenar uma pasta."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "_Mostar miniaturas"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1452,11 +1507,11 @@ msgstr ""
"Selecione esta opção para mostrar arquivos pré-visualizáveis dentro de uma "
"pasta como Ãcones em miniatura gerados automaticamente."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Texto ao lado dos Ãcones"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1467,58 +1522,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Painel Lateral"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Painel de Atalhos"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "Tamanho do _Ãcone:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Muito Pequeno"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Menor"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Pequeno"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normal"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Grande"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Maior"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Muito Grande"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Exibir _Emblemas do Ãcone"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1527,19 +1582,19 @@ msgstr ""
"para todas as pastas às quais foram definidos emblemas no diálogo de "
"propriedades de pasta."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "_Painel de Ãrvore"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "_Tamanho do Ãcone:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Exibir E_mblemas do Ãcone"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1551,16 +1606,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Comportamento"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "Clique único para ativar iten_s"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1568,7 +1626,7 @@ msgstr ""
"Especifique o atraso ant_es de um item ser selecionado\n"
"quando o ponteiro do mouse é parado sobre ele."
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1582,34 +1640,34 @@ msgstr ""
"esquerda. Este comportamento pode ser útil quando cliques únicos ativam os "
"itens, e você deseja apenas selecionar o item sem ativá-lo."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Desabilitado"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Médio"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Longo"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "Clique _duplo para ativar itens"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Avançado"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Permissões da Pasta"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1619,175 +1677,180 @@ msgstr ""
"pode aplicar as mudanças ao conteúdo da pasta.\n"
"Selecione o comportamento padrão abaixo:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Perguntar sempre"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Aplicar Apenas à Pasta"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Aplicar à Pasta e ao Conteúdo"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(Restando %lu hora)"
msgstr[1] "(Restando %lu horas)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(Restando %lu minuto)"
msgstr[1] "(Restando %lu minutos)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(Restando %lu segundo)"
msgstr[1] "(Restando %lu segundos)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Geral"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Nome:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Tipo:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Abrir Com:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Destino da ligação:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Remover"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Modificado:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Acessado:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Tamanho:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Volume:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Espaço Livre:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Emblemas"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Propriedades"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Falha em renomear \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Arquivo"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Menu de Contexto de Arquivo"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Adicionar arquivos..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Incluir arquivos adicionais na lista de arquivos a serem renomeados"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Limpar"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Limpar a lista de arquivos abaixo"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Sobre"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Mostrar informação sobre o Renomeador em Massa do Thunar"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Propriedades..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Visualizar as propriedades do arquivo selecionado"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Renomear Múltiplos Arquivos"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Renomear Arquivos"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
"Clique aqui para renomear de fato os arquivos listados acima para os seus "
"novos nomes."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Novo Nome"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
"Clique aqui para ver a documentação para a operação de renomear selecionada."
@@ -1795,7 +1858,7 @@ msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1808,30 +1871,30 @@ msgstr ""
"Renamers\"."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Selecione arquivos para renomear"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Arquivos de Ãudio"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Arquivos de Imagem"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Arquivos de VÃdeo"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Renomear em Massa"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1840,13 +1903,13 @@ msgstr ""
"poderosa e extensÃvel para renomear vários arquivos\n"
"de uma só vez."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Remover Arquivo"
msgstr[1] "Remover Arquivos"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] ""
@@ -1855,7 +1918,7 @@ msgstr[1] ""
"Remover os arquivos selecionados da lista de arquivos a serem renomeados"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Renomear em Massa - Renomear Múltiplos Arquivos"
@@ -1903,120 +1966,120 @@ msgstr[0] "Adiciona a pasta selecionada ao painel lateral de atalhos"
msgstr[1] "Adiciona as pastas selecionadas ao painel lateral de atalhos"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Montar Volume"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "E_jetar Volume"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_Desmontar Volume"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_Remover Favorito"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Re_nomear Favorito"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "O caminho \"%s\" não se refere a um diretório"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Falha em adicionar novo favorito"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Falha ao ejetar \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Falha ao montar \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Falha em desmontar \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Clique aqui para parar de calcular o tamanho total da pasta."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Cálculo interrompido"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Calculando..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s Bytes"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u item, totalizando %s"
msgstr[1] "%u itens, totalizando %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Menu de Contexto de Pasta"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Criar uma pasta vazia dentro da pasta atual"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "Recor_tar"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Copiar"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "C_olar"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Mover ou copiar arquivos previamente selecionados por um comando de Recortar "
"ou Copiar"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Remover"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2024,127 +2087,99 @@ msgstr ""
"Mover ou copiar arquivos previamente selecionados por um comando de Recortar "
"ou Copiar para a pasta selecionada"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Selecionar todos os _arquivos"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Selecionar todos os arquivos nesta janela"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Selecionar por _Padrão..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Selecionar todos os arquivos que combinam com um certo padrão"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Du_plicar"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Fazer _Ligação"
msgstr[1] "Fazer _Ligações"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Renomear..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Renomear o arquivo selecionado"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Criar _Documento"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Carregando conteúdo da pasta..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Novo arquivo vazio"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Novo arquivo vazio..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Criar Documento a partir do modelo \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Você tem certeza que deseja\n"
-"remover permanentemente \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Você tem certeza que quer remover\n"
-"permanentemente o arquivo selecionado?"
-msgstr[1] ""
-"Você tem certeza que quer remover\n"
-"permanentemente os %u arquivos selecionados?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Se você deletar um arquivo, ele é permanentemente perdido."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Selecione por Padrão"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Selecionar"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Padrão:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Renomear \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "Nome de arquivo inválido provido pelo sÃtio XDS."
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Falhou ao criar uma ligação para a URL \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Falhou ao abrir diretório \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] ""
@@ -2152,7 +2187,7 @@ msgstr[0] ""
msgstr[1] ""
"Preparar os arquivos selecionados para serem movidos com um comando Colar."
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] ""
@@ -2160,24 +2195,39 @@ msgstr[0] ""
msgstr[1] ""
"Preparar os arquivos selecionados para serem copiados com um comando Colar"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Remover o arquivo selecionado permanentemente"
-msgstr[1] "Remover os arquivos selecionados permanentemente"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Duplicar o arquivo selecionado"
+msgstr[1] "Duplicar cada um dos arquivos selecionados"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Duplicar o arquivo selecionado"
msgstr[1] "Duplicar cada um dos arquivos selecionados"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Criar uma ligação simbólica para o arquivo selecionado"
msgstr[1] "Criar uma ligação simbólica para cada um dos arquivos selecionados"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Renomear o arquivo selecionado"
+msgstr[1] "Renomear o arquivo selecionado"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Renomear o arquivo selecionado"
+msgstr[1] "Renomear o arquivo selecionado"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Criar"
@@ -2196,20 +2246,30 @@ msgstr "Nenhum modelo foi instalado"
msgid "_Empty File"
msgstr "Arquivo _Vazio"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Carregando..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "Colar dentro da _Pasta"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "P_ropriedades..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Abrir Nova _Janela"
@@ -2635,23 +2695,23 @@ msgid "Shutter Speed:"
msgstr "Velocidade do Obturador:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Software:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Imagem"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Tipo da Imagem:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Tamanho da Imagem:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2830,39 +2890,39 @@ msgstr "Expressão regular inválida, na posição do caractere %ld: %s"
msgid "Search & Replace"
msgstr "Procurar & Substituir"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2872,30 +2932,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "Copiando arquivos..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "Falhou ao criar o diretório \"%s\""
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Falhou ao criar ligação simbólica \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2903,7 +2963,7 @@ msgstr[0] "Incapaz de abrir %d arquivo."
msgstr[1] "Incapaz de abrir %d arquivos."
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "Incapaz de abrir %d arquivo."
@@ -2912,6 +2972,33 @@ msgstr "Incapaz de abrir %d arquivo."
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Falhou ao conectar ao servidor HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Ações Personalizadas"
@@ -3152,11 +3239,11 @@ msgstr "Tratador de elemento final chamado enquanto em contexto raÃz"
msgid "Unknown closing element <%s>"
msgstr "Elemento de fechamento desconhecido <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Falha em determinar local para salvar uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Comando não configurado"
@@ -3207,3 +3294,87 @@ msgstr "Abrir Pasta com o Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Abrir as pastas especificadas no Thunar"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Remover o arquivo selecionado permanentemente"
+#~ msgstr[1] "Remover os arquivos selecionados permanentemente"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Falhou ao trocar permissões de \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Você quer pulá-lo?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Falhou ao determinar informações do arquivo \"%s\": %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr ""
+#~ "O arquivo \"%s\" já existe. Deseja substituÃ-lo com um arquivo vazio?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Falhou ao remover %s.\n"
+#~ "\n"
+#~ "Você quer pulá-lo?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Falhou ao criar arquivo vazio \"%s\".\n"
+#~ "\n"
+#~ "Você quer pulá-lo?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Falhou ao obter status do arquivo \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Você quer sobrescrevê-lo?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Falhou ao criar o diretório \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Removendo diretórios..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Falhou ao remover o diretório \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Não é possÃvel transferir o diretório raiz"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "\"Pipes\" nomeados não são suportados"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Operação cancelada"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Falhou ao ler alvo da ligação de \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Falhou ao trocar modo de \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Falhou ao copiar arquivo especial \"%s\""
diff --git a/po/ro.po b/po/ro.po
index b46709f5e504b1e6f3ab34d09147086b240b21cc..f039c48603e134b66e5edd0b12fe30ce1ab1861b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-06-05 00:42+0300\n"
"Last-Translator: MiÅŸu Moldovan <dumol@gnome.ro>\n"
"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,279 +17,139 @@ msgstr ""
"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
"2:1))\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Se colectează fişierele..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Doriţi să omiteţi acest fişier?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Nu s-au putut obÅ£ine detalii despre fiÅŸierul „%sâ€: %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Nu s-au putut schimba drepturile pentru „%sâ€: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Nu s-a putut schimba deÅ£inătorul fiÅŸierului „%sâ€: %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Nu s-a putut schimba grupul fiÅŸierului „%sâ€: %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Fişierul „%s†există deja. Doriţi să-l înlocuiţi cu un fişier gol?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Nu s-a putut ÅŸterge „%sâ€.\n"
-"\n"
-"Doriţi să-l omiteţi?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Nu s-a putut crea fiÅŸierul gol „%sâ€.\n"
-"\n"
-"Doriţi să-l omiteţi?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Nu s-a putut citi conţinutul directorului"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Eroare necunoscută"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Nu s-a specificat un câmp „Execâ€"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Nu s-a specificat un URL"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "FiÅŸier desktop invalid"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Nu s-a putut analiza fiÅŸierul"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Nume invalid de fiÅŸier"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Nu s-a putut face „stat†pe fiÅŸierul „%sâ€: %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Doriţi să-l suprascrieţi?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Nu s-a putut ÅŸterge „%sâ€: %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Nu s-a putut încărca aplicaţia din fişierul %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Comandă"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "Comandă pentru pornirea aplicaţiei asociate"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Indicatori"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Indicatori ai aplicaţiei asociate"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Iconiţă"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Selectaţi fişierele de redenumit"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "Iconiţă a aplicaţiei asociate"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Se pregăteşte..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Nume"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Nu s-au putut schimba drepturile pentru „%sâ€: %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Numele aplicaţiei asociate"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Nu s-a putut schimba deÅ£inătorul fiÅŸierului „%sâ€: %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "document %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Nu s-a putut schimba grupul fiÅŸierului „%sâ€: %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Nu s-a putut crea directorul „%sâ€: %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Cale prea lungă pentru a încăpea în memoria tampon"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI prea lung pentra a încăpea în memoria tampon"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Mărime"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Mărime dorită miniatură"
+msgid "The file \"%s\" already exists"
+msgstr "Fişierul „%s†există deja"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Se ÅŸterg directoarele..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Nu s-a putut crea conectorul FIFO „%sâ€"
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Nu s-a putut ÅŸterge directorul „%sâ€: %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Nu se poate transfera directorul rădăcină"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Se pregăteşte..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Nu s-a putut deschide „%s†pentru citire"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Cale invalidă"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Nu s-a putut deschide „%s†pentru scriere"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Utilizator necunoscut „%sâ€"
+msgid "Failed to write data to \"%s\""
+msgstr "Nu s-au putut scrie date în „%sâ€"
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Nu s-a putut determina locul de montare pentru %s"
+msgid "Failed to remove \"%s\""
+msgstr "Nu s-a putut ÅŸterge „%sâ€"
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Nu s-a putut deschide o conexiune către demonul HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Nu s-au putut citi date din „%sâ€"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "copie a %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "legătură către %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "altă copie a %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "altă legătură către %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "a treia copie a %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "a treia legătură către %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
@@ -297,7 +157,7 @@ msgstr[0] "a %u-a copie a %s"
msgstr[1] "a %u-a copie a %s"
msgstr[2] "a %u-a copie a %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
@@ -305,87 +165,185 @@ msgstr[0] "a %u-a legătură către %s"
msgstr[1] "a %u-a legătură către %s"
msgstr[2] "a %u-a legătură către %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Nu s-au putut găsi detalii despre „%sâ€"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Nu s-a putut crea directorul „%sâ€"
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Nu s-a putut crea conectorul FIFO „%sâ€"
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Conectoarele de tip „named pipe†nu sunt suportate"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Nu s-a putut deschide „%s†pentru citire"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Nu s-a putut crea legătura simbolică „%sâ€"
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Fişierul „%s†există deja"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Nu s-a putut deschide „%s†pentru scriere"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Legăturile simbolice nu sunt suportate"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Nu s-au putut citi date din „%sâ€"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Sistem de fiÅŸiere"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Nu s-a putut redenumi „%s†în „%sâ€."
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Nu s-a putut redenumi „%s†în „%sâ€."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Nu s-a putut redenumi „%s†în „%sâ€."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Calea „%s†nu se referă la un director"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Nu s-au putut scrie date în „%sâ€"
+msgid "Failed to load application from file %s"
+msgstr "Nu s-a putut încărca aplicaţia din fişierul %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Nu s-a putut ÅŸterge „%sâ€"
+msgid "Failed to remove \"%s\": %s"
+msgstr "Nu s-a putut ÅŸterge „%sâ€: %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Operaţiune anulată"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Comandă"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Nu s-a putut citi Å£inta legăturii din „%sâ€"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "Comandă pentru pornirea aplicaţiei asociate"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Indicatori"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Indicatori ai aplicaţiei asociate"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Iconiţă"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "Iconiţă a aplicaţiei asociate"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Nume"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Numele aplicaţiei asociate"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Nu s-a putut crea legătura simbolică „%sâ€"
+msgid "%s document"
+msgstr "document %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Nu s-a putut schimba modul pentru „%sâ€"
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Legăturile simbolice nu sunt suportate"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Cale prea lungă pentru a încăpea în memoria tampon"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI prea lung pentra a încăpea în memoria tampon"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Mărime"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Mărime dorită miniatură"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Se colectează fişierele..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Cale invalidă"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Nu s-au putut găsi detalii despre „%sâ€"
+msgid "Unknown user \"%s\""
+msgstr "Utilizator necunoscut „%sâ€"
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "Nu s-a putut determina locul de montare pentru %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Nu s-a putut copia fiÅŸierul special „%sâ€"
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Nu s-a putut deschide o conexiune către demonul HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -502,58 +460,151 @@ msgid "Sort items in descending order"
msgstr "Sortează elementele în ordine descrescătoare"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Nu s-a putut lansa operaţiunea"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Nu s-a putut deschide „%sâ€"
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Nu s-a putut deschide „%sâ€: %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Se copiază fişierele..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Se creează legăturile simbolice..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Se mută fişierele..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Se mută fişierele..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Sigur doriţi să ştergeţi\n"
+"permanent fişierul „%s�"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Sigur doriţi să ştergeţi permanent\n"
+"fiÅŸierul selectat?"
+msgstr[1] ""
+"Sigur doriţi să ştergeţi permanent\n"
+"cele %u fiÅŸiere selectate?"
+msgstr[2] ""
+"Sigur doriţi să ştergeţi permanent\n"
+"cele %u de fiÅŸiere selectate?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Dacă ştergeţi un fişier, acesta nu va mai putea fi recuperat."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Se ÅŸterg fiÅŸierele..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Se creează fişierele..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Se creează directoarele..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "FiÅŸi_er gol"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Nu s-a putut determina locul de montare pentru %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Creează un nou director în „%sâ€"
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Creează di_rector..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Nu s-a putut ÅŸterge „%sâ€"
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Se ÅŸterg fiÅŸierele..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Nu s-a putut seta aplicaÅ£ia implicită pentru „%sâ€"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Nici o aplicaţie nu e selectată"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -562,20 +613,20 @@ msgstr ""
"de tip „%sâ€."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Altă aplicaţie..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Deschide cu"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Utilizează o _comandă personalizată:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -584,40 +635,39 @@ msgstr ""
"din lista de aplicaţii de mai sus."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Navigare..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Utilizează _implicit pentru acest tip de fişiere"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Nu s-a putut adăuga noua aplicaÅ£ie „%sâ€"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Nu s-a putut executa „%sâ€"
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "Åžter_ge lansatorul"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Deschide <i>%s</i> şi alte fişiere de tipul „%s†cu:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -625,8 +675,7 @@ msgstr ""
"Navigaţi în sistemul de fişiere pentru a selecta o aplicaţie pentru "
"deschiderea fiÅŸierelor de tip „%sâ€."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
@@ -635,12 +684,12 @@ msgstr ""
"Schimbaţi aplicaţia implicită pentru fişierele de tipul „%s†cu aplicaţia "
"selectată."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Sigur doriţi să ştergeţi „%s�"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -654,39 +703,39 @@ msgstr ""
"Nu puteţi şterge decât lansatoarele de aplicaţii create utilizând comenzi "
"personalizate în dialogul „Deschide cu†al administratorului de fişiere."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Selectaţi o aplicaţie"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Toate fiÅŸierele"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "FiÅŸiere executabile"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Scripturi Perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Scripturi Python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Scripturi Ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Scripturi shell"
@@ -706,7 +755,7 @@ msgid "Other Applications"
msgstr "Alte aplicaţii"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Nu există nimic în clipboard pentru lipire"
@@ -774,14 +823,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "E_xtinde coloanele automat după nevoie"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Necunoscut(ă)"
@@ -793,7 +843,7 @@ msgstr "Afişare compactă directoare"
msgid "Compact view"
msgstr "Vizualizare compactă"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Introduceţi un nou nume:"
@@ -819,16 +869,32 @@ msgstr "Afişare detaliată directoare"
msgid "Details view"
msgstr "Vizualizare detaliată"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "MiÅŸu Moldovan <dumol@gnome.ro>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Nu s-a putut deschide navigatorul documentaţiei"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Da"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "ÃŽntotdeauna d_a"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Nu"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Renunţă"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Copiază aici"
@@ -883,7 +949,7 @@ msgstr "Deţinător"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Drepturi"
@@ -899,14 +965,10 @@ msgstr "FiÅŸier"
msgid "File Name"
msgstr "Nume fiÅŸier"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Directorul rădăcină nu are părinţi"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Sistem de fiÅŸiere"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -942,14 +1004,14 @@ msgstr "Afişare iconică"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Deschide"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Deschide în fereastră nouă"
@@ -1099,12 +1161,12 @@ msgstr[0] "Deschide fiÅŸierele selectate"
msgstr[1] "Deschide fiÅŸierele selectate"
msgstr[2] "Deschide fiÅŸierele selectate"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "legătură invalidă"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1113,7 +1175,7 @@ msgstr[1] "%d elemente (%s), spaţiu liber: %s"
msgstr[2] "%d de elemente (%s), spaţiu liber: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
@@ -1121,7 +1183,7 @@ msgstr[0] "%d element, spaţiu liber: %s"
msgstr[1] "%d elemente, spaţiu liber: %s"
msgstr[2] "%d de elemente, spaţiu liber: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
@@ -1129,22 +1191,36 @@ msgstr[0] "un element"
msgstr[1] "%d elemente"
msgstr[2] "%d de elemente"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "legătură invalidă „%sâ€"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "„%s†(%s) legătură către %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "„%s†(%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Mărime imagine:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
@@ -1152,7 +1228,7 @@ msgstr[0] "%d element selectat (%s)"
msgstr[1] "%d elemente selectate (%s)"
msgstr[2] "%d de elemente selectate (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
@@ -1160,40 +1236,44 @@ msgstr[0] "un element selectat"
msgstr[1] "%d elemente selectate"
msgstr[2] "%d de elemente selectate"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Spaţiere"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Spaţiul liber între butoanele din cale"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Deschide „%s†în această fereastră"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Deschide „%s†într-o nouă fereastră"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Creează un nou director în „%sâ€"
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Creează di_rector..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1201,29 +1281,29 @@ msgstr ""
"Mută sau copiază fişierele selectate anterior în „%s†utilizând una din "
"comenzile „Taie†sau „LipeÅŸteâ€"
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Lipeşte în director"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Arată proprietăţile directorului „%sâ€"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Proprietăţi"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Director nou"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Creare director nou"
@@ -1240,11 +1320,11 @@ msgstr "_Locaţie:"
msgid "Failed to launch \"%s\""
msgstr "Nu s-a putut lansa „%sâ€"
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Mărime iconiţă"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Mărimea iconiţei din intrarea locaţiei"
@@ -1326,17 +1406,15 @@ msgid "Stop applying permissions recursively."
msgstr "Nu mai aplica drepturile recursiv."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "ÃŽntrebare"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Aplicare recursivă?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1345,11 +1423,11 @@ msgstr ""
"Doriţi să aplicaţi schimbările recursiv pentru toate\n"
"fiÅŸierele si subdirectoarele din directorul selectat?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Nu mai repeta această întrebare"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1359,29 +1437,29 @@ msgstr ""
"întrebat din nou. Puteţi schimba această setare în preferinţele Thunar."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Nu s-a putut schimba grupul"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Nu s-au putut aplica noile drepturi"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Deţinător necunoscut"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Corectare automată a drepturilor directorului?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Correctează drepturile directorului"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1391,77 +1469,57 @@ msgstr ""
"utilizatorii cu drepturi de citire a conţinutului directorului vor mai putea "
"intra apoi în acest director."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Da"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "ÃŽntotdeauna d_a"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Nu"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Renunţă"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Preferinţe administrator de fişiere"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Vizualizări"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Vizualizare implicită"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Arată _noile directoare utilizând:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Vizualizare iconică"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Vizualizare listă detaliată"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Vizualizare listă compactă"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Ultima vizualizare activă"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Sortează _directoarele înaintea fişierelor"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Selectaţi această opţiune pentru a lista subdirectoarele înaintea fişierelor "
"la sortarea conţinutului unui director."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Arată _miniaturi"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1469,11 +1527,11 @@ msgstr ""
"Selectaţi această opţiune pentru a activa afişarea ca iconiţe miniaturale "
"automat generate a fiÅŸierelor ce pot fi previzualizate."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Text lângă iconiţe"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1484,58 +1542,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Vedere laterală"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Vedere scurtături"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "Mărime _iconiţe:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Minuscule"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Foarte mici"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Mici"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normale"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Mari"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Foarte mari"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Imense"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Arată _emblemele iconiţelor"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1543,19 +1601,19 @@ msgstr ""
"Selectaţi această opţiune pentru a afişa emblemele iconiţelor în dreptul "
"scurtăturilor pentru toate directoarele cu embleme asociate."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Vedere arbore"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Mă_rime iconiţe:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Arată e_mblemele iconiţelor"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1566,16 +1624,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Comportament"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "Click _simplu pentru activarea elementelor"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1583,7 +1644,7 @@ msgstr ""
"Specificaţi întârzierea cu care un _element va fi\n"
"selectat automat când se găseşte sub mouse:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1598,34 +1659,34 @@ msgstr ""
"click simplu ar activa elementul, dar se doreÅŸte doar selectarea "
"elementului, fără activarea sa."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Dezactivată"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Medie"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Lungă"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "Click _dublu pentru activarea elementelor"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Avansate"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Permisiuni directoare"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1635,19 +1696,19 @@ msgstr ""
"aplica schimbările şi conţinutului acelui director.\n"
"Selectaţi mai jos comportamentul implicit:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Întreabă de fiecare dată"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Aplică doar directorului"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Aplică directorului şi conţinutului"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1655,7 +1716,7 @@ msgstr[0] "(durează încă o oră)"
msgstr[1] "(durează încă %lu ore)"
msgstr[2] "(durează încă %lu de ore)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1663,7 +1724,7 @@ msgstr[0] "(durează încă un minut)"
msgstr[1] "(durează încă %lu minute)"
msgstr[2] "(durează încă %lu de minute)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1671,140 +1732,145 @@ msgstr[0] "(durează încă o secundă)"
msgstr[1] "(durează încă %lu secunde)"
msgstr[2] "(durează încă %lu de secunde)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Generale"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Nume:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Tip:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Deschide cu:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Ţintă legătură:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "Åžter_ge"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Modificat:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Accesat:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Mărime:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Volum:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Spaţiu liber:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Embleme"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Proprietăţi"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Nu s-a reuÅŸit redenumirea „%sâ€"
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_FiÅŸier"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Meniu contextual fiÅŸiere"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Adaugă fişiere..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Include alte fişiere în lista fişierelor de redenumit"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "GoleÅŸte"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "GoleÅŸte lista de fiÅŸiere de mai jos"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Despre"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Arată detalii despre redenumirea în masă Thunar"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Proprietăţi..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Arată proprietăţile fişierului selectat"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Redenumire în masă de fişiere"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "R_edenumeÅŸte fiÅŸierele"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "Daţi click aici pentru a redenumi fişierele de mai sus cu noile nume."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Nume nou"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
"Daţi click aici pentru a deschide documentaţia pentru operaţiunea de "
@@ -1813,7 +1879,7 @@ msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1824,30 +1890,30 @@ msgstr ""
"Thunar din surse, verificaÅ£i activarea modulului „Simple Builtin Renamersâ€."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Selectaţi fişierele de redenumit"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "FiÅŸiere audio"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "FiÅŸiere imagini"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "FiÅŸiere video"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Redenumire în masă"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1855,14 +1921,14 @@ msgstr ""
"Redenumirea în masă este o unealtă flexibilă şi\n"
"extensibilă pentru redenumirea mai multor fişiere odată."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Åžterge fiÅŸierul"
msgstr[1] "Åžterge fiÅŸierele"
msgstr[2] "Åžterge fiÅŸierele"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Åžterge fiÅŸierul selectat din lista de fiÅŸiere de redenumit"
@@ -1870,7 +1936,7 @@ msgstr[1] "Åžterge fiÅŸierele selectate din lista de fiÅŸiere de redenumit"
msgstr[2] "Åžterge fiÅŸierele selectate din lista de fiÅŸiere de redenumit"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Redenumire în masă - Redenumiţi mai multe fişiere"
@@ -1921,81 +1987,81 @@ msgstr[1] "Adaugă directoarele selectate la scurtăturile din stânga"
msgstr[2] "Adaugă directoarele selectate la scurtăturile din stânga"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Montează volumul"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "E_jectează volumul"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_Demontează volumul"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "Şter_ge scurtătura"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Rede_numeşte scurtătura"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Calea „%s†nu se referă la un director"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Nu s-a putut adăuga o nouă scurtătură"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Nu s-a putut ejecta „%sâ€"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Nu s-a putut monta „%sâ€"
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Nu s-a putut demonta „%sâ€"
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr ""
"Daţi click aici pentru a opri calcularea mărimii totale a directorului."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Calcularea a fost oprită"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Se calculează..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s octeţi"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
@@ -2003,40 +2069,40 @@ msgstr[0] "%u element, totalizând %s"
msgstr[1] "%u elemente, totalizând %s"
msgstr[2] "%u elemente, totalizând %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Meniu contextual director"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Creează un director gol în directorul curent"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "_Taie"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Copiază"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "_LipeÅŸte"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Mută sau copiază fişierele anterior selectate cu o comandă de tip „Taie†sau "
"„Copiazăâ€"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "Åžter_ge"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2044,131 +2110,100 @@ msgstr ""
"Mută sau copiază în directorul curent fişierele anterior selectate cu o "
"comandă de tip „Taie†sau „Copiazăâ€"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Selectează to_ate fişierele"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Selectează toate fişierele din această fereastră"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Selectează după un _model..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Selectează toate fişierele după un anumit model"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "_Duplică"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "_Fă o legătură"
msgstr[1] "_Fă legături"
msgstr[2] "_Fă legături"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_RedenumeÅŸte..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "RedenumeÅŸte fiÅŸierul selectat"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Creează un docum_ent"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Se încarcă conţinutul directorului..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Nou fiÅŸier gol"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Nou fiÅŸier gol..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Creează un document din ÅŸablonul „%sâ€"
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Sigur doriţi să ştergeţi\n"
-"permanent fişierul „%s�"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Sigur doriţi să ştergeţi permanent\n"
-"fiÅŸierul selectat?"
-msgstr[1] ""
-"Sigur doriţi să ştergeţi permanent\n"
-"cele %u fiÅŸiere selectate?"
-msgstr[2] ""
-"Sigur doriţi să ştergeţi permanent\n"
-"cele %u de fiÅŸiere selectate?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Dacă ştergeţi un fişier, acesta nu va mai putea fi recuperat."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Selectează după un model"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Selectează"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Model"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "RedenumeÅŸte „%sâ€"
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "Nume de fiÅŸier invalid de la sursa XDS"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Nu s-a putut crea o legătură pentru URL-ul „%sâ€"
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Nu s-a putut deschide directorul „%sâ€"
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "PregăteÅŸte fiÅŸierul selectat pentru a fi mutat cu comanda „LipeÅŸteâ€"
@@ -2177,7 +2212,7 @@ msgstr[1] ""
msgstr[2] ""
"PregăteÅŸte fiÅŸierele selectate pentru a fi mutate cu comanda „LipeÅŸteâ€"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] ""
@@ -2187,27 +2222,44 @@ msgstr[1] ""
msgstr[2] ""
"PregăteÅŸte fiÅŸierele selectate pentru a fi copiate cu comanda „LipeÅŸteâ€"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Åžterge permanent fiÅŸierul selectat"
-msgstr[1] "Åžterge permanent fiÅŸierele selectate"
-msgstr[2] "Åžterge permanent fiÅŸierele selectate"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Duplică fişierul selectat"
+msgstr[1] "Duplică fişierele selectate"
+msgstr[2] "Duplică fişierele selectate"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Duplică fişierul selectat"
msgstr[1] "Duplică fişierele selectate"
msgstr[2] "Duplică fişierele selectate"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Creează o legătură simbolică pentru fişierul selectat"
msgstr[1] "Creează o legătură simbolică pentru fiecare fişier selectat"
msgstr[2] "Creează o legătură simbolică pentru fiecare fişier selectat"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "RedenumeÅŸte fiÅŸierul selectat"
+msgstr[1] "RedenumeÅŸte fiÅŸierul selectat"
+msgstr[2] "RedenumeÅŸte fiÅŸierul selectat"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "RedenumeÅŸte fiÅŸierul selectat"
+msgstr[1] "RedenumeÅŸte fiÅŸierul selectat"
+msgstr[2] "RedenumeÅŸte fiÅŸierul selectat"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Creează"
@@ -2226,20 +2278,30 @@ msgstr "Nu există şabloane instalate"
msgid "_Empty File"
msgstr "FiÅŸi_er gol"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Se încarcă..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "_Lipeşte în director"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "P_roprietăţi..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Deschide _fereastră nouă"
@@ -2663,23 +2725,23 @@ msgid "Shutter Speed:"
msgstr "Diafragmă:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Program:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Imagine:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Tip imagine:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Mărime imagine:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2858,39 +2920,39 @@ msgstr "Expresie regulară invalidă la caracterul %ld: %s"
msgid "Search & Replace"
msgstr "Căutare şi înlocuire"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2900,30 +2962,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "Se copiază fişierele..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "Nu s-a putut crea directorul „%sâ€"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Nu s-a putut crea legătura simbolică „%sâ€"
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2932,7 +2994,7 @@ msgstr[1] "Nu s-au putut deschide %d fiÅŸiere"
msgstr[2] "Nu s-au putut deschide %d de fiÅŸiere"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "Nu s-a putut deschide un fiÅŸier"
@@ -2941,6 +3003,33 @@ msgstr "Nu s-a putut deschide un fiÅŸier"
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Nu s-a putut deschide o conexiune către demonul HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Acţiuni personalizate"
@@ -3180,11 +3269,11 @@ msgstr "Apel în cel mai de jos context pentru un descriptor de element final"
msgid "Unknown closing element <%s>"
msgstr "Element de închidere necunoscut <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Nu s-a putut determina locaţia de salvare pentru uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Comandă neconfigurată"
@@ -3235,3 +3324,87 @@ msgstr "Deschide directorul cu Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Deschide directoarele specificate cu Thunar"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Åžterge permanent fiÅŸierul selectat"
+#~ msgstr[1] "Åžterge permanent fiÅŸierele selectate"
+#~ msgstr[2] "Åžterge permanent fiÅŸierele selectate"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Nu s-au putut schimba drepturile pentru „%sâ€: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Doriţi să omiteţi acest fişier?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Nu s-au putut obÅ£ine detalii despre fiÅŸierul „%sâ€: %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "Fişierul „%s†există deja. Doriţi să-l înlocuiţi cu un fişier gol?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Nu s-a putut ÅŸterge „%sâ€.\n"
+#~ "\n"
+#~ "Doriţi să-l omiteţi?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Nu s-a putut crea fiÅŸierul gol „%sâ€.\n"
+#~ "\n"
+#~ "Doriţi să-l omiteţi?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Nu s-a putut face „stat†pe fiÅŸierul „%sâ€: %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Doriţi să-l suprascrieţi?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Nu s-a putut crea directorul „%sâ€: %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Se ÅŸterg directoarele..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Nu s-a putut ÅŸterge directorul „%sâ€: %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Nu se poate transfera directorul rădăcină"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Conectoarele de tip „named pipe†nu sunt suportate"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Operaţiune anulată"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Nu s-a putut citi Å£inta legăturii din „%sâ€"
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Nu s-a putut schimba modul pentru „%sâ€"
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Nu s-a putut copia fiÅŸierul special „%sâ€"
diff --git a/po/ru.po b/po/ru.po
index 469bcee9f9f9641fb03abe32645aca3a371163ab..2b748e18ddae0036afc3502393d8ff1c4151f38a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-04-25 20:35+0600\n"
"Last-Translator: Andrey Fedoseev <andrey.fedoseev@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -18,280 +18,139 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Сбор файлов..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"ПропуÑтить?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Ðе удалоÑÑŒ получить информацию о файле \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Ðе удалоÑÑŒ изменить права Ð´Ð»Ñ \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Ðе удалоÑÑŒ изменить владельца файла \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Ðе удалоÑÑŒ изменить группу Ð´Ð»Ñ \"%s\": %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Файл \"%s\" уже ÑущеÑтвует. Заменить его пуÑтым файлом?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Ðевозможно удалить \"%s\".\n"
-"\n"
-"ПропуÑтить?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Ðевозможно Ñоздать пуÑтой файл \"%s\".\n"
-"\n"
-"ПропуÑтить?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Ðе удалоÑÑŒ прочитать Ñодержимое папки"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Ðе указано поле Exec"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Ðе указано поле URL"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Ðекорректный .desktop-файл"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Ðе удалоÑÑŒ провеÑти разбор файла"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Ðе удалоÑÑŒ выполнить команду stat Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° \"%s\": %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"ПерезапиÑать?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Ðе удалоÑÑŒ удалить \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Ðе удалоÑÑŒ загрузить приложение из файла %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Команда"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
+#: ../thunar-vfs/thunar-vfs-info.c:458
#, fuzzy
-msgid "Flags"
-msgstr "Параметры"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr ""
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Значок"
+msgid "Only local files may be renamed"
+msgstr "Выберите файлы Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr ""
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Подготовка..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "ИмÑ"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Ðе удалоÑÑŒ изменить права Ð´Ð»Ñ \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr ""
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Ðе удалоÑÑŒ изменить владельца файла \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "%s документ"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Ðе удалоÑÑŒ изменить группу Ð´Ð»Ñ \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Ðе удалоÑÑŒ Ñоздать папку \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Слишком длинный путь, чтобы помеÑтить его в буфер"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "Слишком длинный URI, чтобы помеÑтить его в буфер"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Размер"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Предпочитаемый размер образцов"
+msgid "The file \"%s\" already exists"
+msgstr "Файл \"%s\" уже ÑущеÑтвует"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Удаление папок..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Ðе удалоÑÑŒ Ñоздать именованый канал (named fifo) \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Ðе удалоÑÑŒ удалить папку \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "ПеремеÑтить корневой каталог невозможно"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Подготовка..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Ðеверный путь"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "ÐеизвеÑтный пользователь \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "Ðе удалоÑÑŒ запиÑать данные в \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Ðе удалоÑÑŒ определить точку Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ %s"
+msgid "Failed to remove \"%s\""
+msgstr "Ðе удалоÑÑŒ удалить \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Ðе удалоÑÑŒ ÑоединитьÑÑ Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¾Ð¼ HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Ðе удалоÑÑŒ прочитать данные из \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "ÐºÐ¾Ð¿Ð¸Ñ %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "ÑÑылка на %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "Ð´Ñ€ÑƒÐ³Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "Ð´Ñ€ÑƒÐ³Ð°Ñ ÑÑылка на %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "Ñ‚Ñ€ÐµÑ‚ÑŒÑ ÐºÐ¾Ð¿Ð¸Ñ %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "Ñ‚Ñ€ÐµÑ‚ÑŒÑ ÑÑылка на %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
@@ -299,7 +158,7 @@ msgstr[0] "%u-Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ %s"
msgstr[1] "%u-Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ %s"
msgstr[2] "%u-Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
@@ -307,87 +166,186 @@ msgstr[0] "%u-Ð°Ñ ÑÑылка на %s"
msgstr[1] "%u-Ð°Ñ ÑÑылка на %s"
msgstr[2] "%u-Ð°Ñ ÑÑылка на %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Ðе удалоÑÑŒ определить информацию о файле \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Ðе удалоÑÑŒ Ñоздать папку \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Ðе удалоÑÑŒ Ñоздать именованый канал (named fifo) \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Именованые каналы (named fifo) не поддерживаютÑÑ"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Ðе удалоÑÑŒ Ñоздать ÑимволичеÑкую ÑÑылку \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Файл \"%s\" уже ÑущеÑтвует"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "СимволичеÑкие ÑÑылки не поддерживаютÑÑ"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Ðе удалоÑÑŒ прочитать данные из \"%s\""
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Ðе удалоÑÑŒ переименовать \"%s\" в \"%s\"."
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Ðе удалоÑÑŒ переименовать \"%s\" в \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Ðе удалоÑÑŒ переименовать \"%s\" в \"%s\"."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Путь \"%s\" не указывает на папку"
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Ðе удалоÑÑŒ запиÑать данные в \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "Ðе удалоÑÑŒ загрузить приложение из файла %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Ðе удалоÑÑŒ удалить \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "Ðе удалоÑÑŒ удалить \"%s\": %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Команда"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Ðе удалоÑÑŒ прочитать данные из \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+#, fuzzy
+msgid "Flags"
+msgstr "Параметры"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Значок"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "ИмÑ"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Ðе удалоÑÑŒ Ñоздать ÑимволичеÑкую ÑÑылку \"%s\""
+msgid "%s document"
+msgstr "%s документ"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Ðе удалоÑÑŒ изменить права \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "СимволичеÑкие ÑÑылки не поддерживаютÑÑ"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Слишком длинный путь, чтобы помеÑтить его в буфер"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "Слишком длинный URI, чтобы помеÑтить его в буфер"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Размер"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Предпочитаемый размер образцов"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Сбор файлов..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Ðеверный путь"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Ðе удалоÑÑŒ определить информацию о файле \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "ÐеизвеÑтный пользователь \"%s\""
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "Ðе удалоÑÑŒ определить точку Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Ðе удалоÑÑŒ cкопировать Ñпециальный файл \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Ðе удалоÑÑŒ ÑоединитьÑÑ Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¾Ð¼ HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -504,58 +462,151 @@ msgid "Sort items in descending order"
msgstr "Сортировать по убыванию"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Ðе удалоÑÑŒ запуÑтить операцию"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Ðе удалоÑÑŒ открыть \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Ðе удалоÑÑŒ открыть \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Копирование файлов..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Создание ÑимволичеÑких ÑÑылок..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Перемещение файлов..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Перемещение файлов..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Вы уверены, что хотите\n"
+"навÑегда удалить \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Ð’Ñ‹ уверены, что хотите навÑегда\n"
+"удалить выбранный файл?"
+msgstr[1] ""
+"Ð’Ñ‹ уверены, что хотите навÑегда\n"
+"удалить %u выбранных файла?"
+msgstr[2] ""
+"Ð’Ñ‹ уверены, что хотите навÑегда\n"
+"удалить %u выбранных файлов?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "ЕÑли вы удалите файл, он будет утрачен навÑегда."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Удаление файлов..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Создание файлов..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Создание папок..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "ПуÑтой _файл"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Ðе удалоÑÑŒ определить точку Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Создать новую папку в \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Создать _папку..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Ðе удалоÑÑŒ удалить \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Удаление файлов..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Ðе удалоÑÑŒ назначить приложение по умолчанию Ð´Ð»Ñ \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ выбраны"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -564,20 +615,20 @@ msgstr ""
"файлов типа \"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Другое приложение..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Открыть Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "ИÑпользовать _команду:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -586,41 +637,40 @@ msgstr ""
"Ñтом ÑпиÑке."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Обзор..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "ИÑпользовать Ñту программу Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка Ñтого типа файлов"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Ðе удалоÑÑŒ добавить приложение \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Ðе удалоÑÑŒ запуÑтить \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
#, fuzzy
msgid "_Remove Launcher"
msgstr "ЗапуÑк"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Открывать <i>%s</i> и другие файлы типа \"%s\" при помощи:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -628,22 +678,21 @@ msgstr ""
"ПроÑмотреть файловую ÑиÑтему, чтобы выбрать приложение, которое будет "
"иÑпользоватьÑÑ Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² типа \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr "Изменить приложение по умолчанию Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² типа \"%s\"."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, fuzzy, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr ""
"Вы уверены, что хотите\n"
"навÑегда удалить \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -652,39 +701,39 @@ msgid ""
"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Выберите приложение"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Ð’Ñе файлы"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "ИÑполнÑемые файлы"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Скрипты Perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Скрипты Python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Скрипты Ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Скрипты Shell"
@@ -704,7 +753,7 @@ msgid "Other Applications"
msgstr "Другие приложениÑ"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Буфер обмена пуÑÑ‚"
@@ -772,14 +821,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "_ÐвтоматичеÑки увеличивать ширину Ñтолбцов при необходимоÑти"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "ÐеизвеÑтно"
@@ -791,7 +841,7 @@ msgstr "Компактный ÑпиÑок"
msgid "Compact view"
msgstr "Компактный ÑпиÑок"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Введите имÑ:"
@@ -817,7 +867,7 @@ msgstr "Подробный ÑпиÑок"
msgid "Details view"
msgstr "ПроÑмотр в виде ÑпиÑка"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr ""
"Ðндрей ФедоÑеев <andrey.fedoseev@gmail.com>\n"
@@ -825,10 +875,26 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Ðе удалоÑÑŒ открыть программу Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра документации"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Да"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Да Ð´Ð»Ñ _вÑех"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Ðет"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Отменить"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Копировать Ñюда"
@@ -883,7 +949,7 @@ msgstr "Владелец"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Права"
@@ -899,14 +965,10 @@ msgstr "Файл"
msgid "File Name"
msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Корневой каталог не имеет родительÑкого каталога"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -940,14 +1002,14 @@ msgstr "ПроÑмотр в виде значков"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Открыть"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Открыть в новом окне"
@@ -1094,13 +1156,13 @@ msgstr[0] "Открыть выбранные файлы"
msgstr[1] "Открыть выбранные файлы"
msgstr[2] "Открыть выбранные файлы"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "Ð±Ð¸Ñ‚Ð°Ñ ÑÑылка"
# c-format
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1109,7 +1171,7 @@ msgstr[1] "%d объекта (%s), Ñвободного меÑта: %s"
msgstr[2] "%d объектов (%s), Ñвободного меÑта: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
@@ -1117,7 +1179,7 @@ msgstr[0] "%d объект, Ñвободного меÑта: %s"
msgstr[1] "%d объекта, Ñвободного меÑта: %s"
msgstr[2] "%d объектов, Ñвободного меÑта: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
@@ -1125,22 +1187,36 @@ msgstr[0] "%d объект"
msgstr[1] "%d объекта"
msgstr[2] "%d объектов"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" Ð±Ð¸Ñ‚Ð°Ñ ÑÑылка"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) ÑÑылаетÑÑ Ð½Ð° %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Размер:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
@@ -1148,7 +1224,7 @@ msgstr[0] "выбран %d объект (%s)"
msgstr[1] "выбрано %d объекта (%s)"
msgstr[2] "выбрано %d объектов (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
@@ -1156,40 +1232,44 @@ msgstr[0] "выбран %d объект"
msgstr[1] "выбрано %d объекта"
msgstr[2] "выбрано %d объектов"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Промежутки"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Размер промежутков между кнопками в панели пути"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Открыть \"%s\" в Ñтом окне"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Открыть \"%s\" в новом окне"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Создать новую папку в \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Создать _папку..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1197,29 +1277,29 @@ msgstr ""
"ПеремеÑтить или копировать выбранные файлы командой Вырезать или Копировать "
"в \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Ð’Ñтавить в папку"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "ПроÑмотреть ÑвойÑтва папки \"%s\""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_СвойÑтва"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "ÐÐ¾Ð²Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Создать новую папку"
@@ -1236,11 +1316,11 @@ msgstr "_ÐдреÑ:"
msgid "Failed to launch \"%s\""
msgstr "Ðе удалоÑÑŒ запуÑтить \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Размер значков"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Размер значков Ð´Ð»Ñ Ñлемента в панели пути"
@@ -1322,17 +1402,15 @@ msgid "Stop applying permissions recursively."
msgstr "Прекратить рекурÑивное изменение прав."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "ВопроÑ"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Применить рекурÑивно?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1341,11 +1419,11 @@ msgstr ""
"Ð’Ñ‹ хотите рекурÑивно применить изменениÑ\n"
"ко вÑем файлам и папкам в выбранной папке?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Больше не Ñпрашивать"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1355,29 +1433,29 @@ msgstr ""
"изменить ваш выбор, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ наÑтроек."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Ðе удалоÑÑŒ изменить группу"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Ðе удалоÑÑŒ применить новые права"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Владелец файла неизвеÑтен"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "ÐвтоматичеÑки иÑправить права Ð´Ð»Ñ Ð¿Ð°Ð¿ÐºÐ¸?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "ИÑправить права Ð´Ð»Ñ Ð¿Ð°Ð¿ÐºÐ¸"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1386,76 +1464,56 @@ msgstr ""
"Права Ð´Ð»Ñ Ð¿Ð°Ð¿ÐºÐ¸ будут иÑправлены автоматичеÑки. Только пользователи, которым "
"разрешено чтение Ñодержимого папки, Ñмогут открыть её."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Да"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Да Ð´Ð»Ñ _вÑех"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Ðет"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Отменить"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "ÐаÑтройки файлового менеджера"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Вид"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Режим проÑмотра по умолчанию"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "ПроÑматривать _новые папки, иÑпользуÑ:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "ПроÑмотр в виде значков"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "ПроÑмотр в виде подробного ÑпиÑка"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "ПроÑмотр в виде компактного ÑпиÑка"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "ПоÑледний активный режим проÑмотра"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Отображать _папки перед файлами"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"ИÑпользуйте Ñтот параметр, чтобы включить отображение папок перед файлами."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Показывать _образцы файлов"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1463,11 +1521,11 @@ msgstr ""
"ИÑпользуйте Ñтот параметр, чтобы включить показ образцов Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð², Ð´Ð»Ñ "
"которых Ñто возможно."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_ТекÑÑ‚ Ñ€Ñдом Ñо значками"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1478,58 +1536,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Ð‘Ð¾ÐºÐ¾Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Панель закладок"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_Размер значков:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Крошечные"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Очень маленькие"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Маленькие"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Ðормальные"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Крупные"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Большие"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Очень большие"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Отображать _Ñмблемы на значках"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1537,19 +1595,19 @@ msgstr ""
"Включите Ñтот параметр, чтобы отображать Ñмблемы на значках в панели "
"закладок."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Дерево"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Размер _значков:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Отображать Ñ_мблемы на значках"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1560,16 +1618,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Поведение"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "_Одиночный щелчок активирует объект"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1577,7 +1638,7 @@ msgstr ""
"Укажите задержку перед тем, как объект будет выбран\n"
"при удержании над ним ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñ Ð¼Ñ‹ÑˆÐ¸:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1591,34 +1652,34 @@ msgstr ""
"активирует объекты, а вам нужно выбрать объект без его активации. Вы можете "
"отключить Ñтот режим помеÑтив ползунок в крайнюю левую позицию."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Отключено"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "СреднÑÑ"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "БольшаÑ"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Двойной щелчок активирует объект"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Дополнительно"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Права"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1628,19 +1689,19 @@ msgstr ""
"применÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ðº её Ñодержимому. Выберите\n"
"поведение по умолчанию:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Каждый раз Ñпрашивать"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "ПрименÑÑ‚ÑŒ только к Ñамой папке"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "ПрименÑÑ‚ÑŒ к папке и её Ñодержимому"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1648,7 +1709,7 @@ msgstr[0] "(оÑтаётÑÑ %lu чаÑ)"
msgstr[1] "(оÑтаётÑÑ %lu чаÑа)"
msgstr[2] "(оÑтаётÑÑ %lu чаÑов)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1656,7 +1717,7 @@ msgstr[0] "(оÑтаётÑÑ %lu минута)"
msgstr[1] "(оÑтаётÑÑ %lu минуты)"
msgstr[2] "(оÑтаётÑÑ %lu минут)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1664,141 +1725,146 @@ msgstr[0] "(оÑтаётÑÑ %lu Ñекунда)"
msgstr[1] "(оÑтаётÑÑ %lu Ñекунды)"
msgstr[2] "(оÑтаётÑÑ %lu Ñекунд)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "ОÑновное"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "ИмÑ:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Тип:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Открывать Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Цель ÑÑылки:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Удалить"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Изменён:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "ДоÑтуп:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Размер:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Том:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Свободное меÑто:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Ðмблемы"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - СвойÑтва"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Ðе удалоÑÑŒ переименовать \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Файл"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "КонтекÑтное меню файла"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Добавить файлы..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Включить дополнительные файлы в ÑпиÑок Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "ОчиÑтить"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "ОчиÑтить ÑпиÑок"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_О программе"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Показать информацию об инÑтрументе Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² Thunar"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_СвойÑтва..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "ПроÑмотреть ÑвойÑтва выбранного файла"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Переименование неÑкольких файлов"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Переименовать файлы"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
"Ðажмите, чтобы произвеÑти переименование файлов, находÑщихÑÑ Ð² Ñтом ÑпиÑке."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Ðовое имÑ"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
"Ðажмите, чтобы проÑмотреть документацию по выбранной операции переименованиÑ."
@@ -1806,7 +1872,7 @@ msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1818,30 +1884,30 @@ msgstr ""
"убедитеÑÑŒ, что раÑширение \"Simple Builtin Renamers\" включено."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Выберите файлы Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Ðудиофайлы"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "ИзображениÑ"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Видеофайлы"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "МаÑÑовое переименование"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1849,14 +1915,14 @@ msgstr ""
"МаÑÑовое переименование файлов Ñто мощный раÑширÑемый инÑтрумент Ð´Ð»Ñ "
"одновременного Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½ÐµÑкольких файлов."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Убрать файл"
msgstr[1] "Убрать файлы"
msgstr[2] "Убрать файлы"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Убрать выбранный файл из ÑпиÑка Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ"
@@ -1864,7 +1930,7 @@ msgstr[1] "Убрать выбранные файлы из ÑпиÑка длÑ
msgstr[2] "Убрать выбранные файлы из ÑпиÑка Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "МаÑÑовое переименование"
@@ -1914,80 +1980,80 @@ msgstr[1] "Добавить выбранные папки в закладки н
msgstr[2] "Добавить выбранные папки в закладки на боковой панели"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Подключить том"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "_Извлечь том"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "О_тключить том"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_Удалить закладку"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "_Переименовать закладку"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Путь \"%s\" не указывает на папку"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Ðе удалоÑÑŒ добавить закладку"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Ðе удалоÑÑŒ извлечь \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Ðе удалоÑÑŒ подключить \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Ðе удалоÑÑŒ отключить \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Ðажмите, чтобы оÑтановить вычиÑление общего размера папки."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "ВычиÑление прервано"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "ВычиÑление..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s байт"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
@@ -1995,39 +2061,39 @@ msgstr[0] "%u Ñлемент, вычиÑление объёма %s"
msgstr[1] "%u Ñлемента, вычиÑление объёма %s"
msgstr[2] "%u Ñлементов, вычиÑление объёма %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "КонтекÑтное меню папки"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Создать пуÑтую папку внутри текущей папки"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "_Вырезать"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Копировать"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "Ð’ÑÑ‚_авить"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"ПеремеÑтить или копировать файлы, выбранные командой Вырезать или Копировать"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Удалить"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2035,165 +2101,151 @@ msgstr ""
"ПеремеÑтить или копировать файлы, выбранные командой Вырезать или "
"Копировать, в указанную папку "
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Выбрать вÑ_е файлы"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Выбрать вÑе файлы в Ñтом окне"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Выбрать по _шаблону..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Выбрать вÑе файлы, чьи имена удовлетворÑÑŽÑ‚ заданному шаблону"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Со_здать копию файла"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Создать _ÑÑылку"
msgstr[1] "Создать _ÑÑылки"
msgstr[2] "Создать _ÑÑылки"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Переименовать..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Переименовать выбранный файл"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Создать _документ"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Загрузка Ñодержимого папки..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Ðовый файл"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Ðовый файл..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Создать документ по шаблону \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Вы уверены, что хотите\n"
-"навÑегда удалить \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Ð’Ñ‹ уверены, что хотите навÑегда\n"
-"удалить выбранный файл?"
-msgstr[1] ""
-"Ð’Ñ‹ уверены, что хотите навÑегда\n"
-"удалить %u выбранных файла?"
-msgstr[2] ""
-"Ð’Ñ‹ уверены, что хотите навÑегда\n"
-"удалить %u выбранных файлов?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "ЕÑли вы удалите файл, он будет утрачен навÑегда."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Выбрать по шаблону"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Выбрать"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Шаблон:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Переименовать \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, fuzzy, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Ðе удалоÑÑŒ Ñоздать именованый канал (named fifo) \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Ðе удалоÑÑŒ открыть папку: \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "Подготовить выбранный файл Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð’Ñтавить"
msgstr[1] "Подготовить выбранные файлы Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð’Ñтавить"
msgstr[2] "Подготовить выбранные файлы Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð’Ñтавить"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "Подготовить выбранный файл Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð’Ñтавить"
msgstr[1] "Подготовить выбранные файлы Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð’Ñтавить"
msgstr[2] "Подготовить выбранные файлы Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð’Ñтавить"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "ÐавÑегда удалить выбранный файл"
-msgstr[1] "ÐавÑегда удалить выбранные файлы"
-msgstr[2] "ÐавÑегда удалить выбранные файлы"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Создать копию выбранного файла"
+msgstr[1] "Создать копию каждого выбранного файла"
+msgstr[2] "Создать копию каждого выбранного файла"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Создать копию выбранного файла"
msgstr[1] "Создать копию каждого выбранного файла"
msgstr[2] "Создать копию каждого выбранного файла"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Создать ÑимволичеÑкую ÑÑылку Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾ файла"
msgstr[1] "Создать ÑимволичеÑкую ÑÑылку Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ выбранного файла"
msgstr[2] "Создать ÑимволичеÑкую ÑÑылку Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ выбранного файла"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Переименовать выбранный файл"
+msgstr[1] "Переименовать выбранный файл"
+msgstr[2] "Переименовать выбранный файл"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Переименовать выбранный файл"
+msgstr[1] "Переименовать выбранный файл"
+msgstr[2] "Переименовать выбранный файл"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Создать"
@@ -2212,20 +2264,30 @@ msgstr "Ðе уÑтановлено ни одного шаблона"
msgid "_Empty File"
msgstr "ПуÑтой _файл"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Загрузка..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "Ð’ÑÑ‚_авить файлы в папку"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "_СвойÑтва..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Открыть _новое окно"
@@ -2650,23 +2712,23 @@ msgid "Shutter Speed:"
msgstr "СкороÑÑ‚ÑŒ затвора:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Программное обеÑпечение:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "Изображение"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Тип:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Размер:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2847,39 +2909,39 @@ msgstr "ÐедопуÑтимое регулÑрное выражение на п
msgid "Search & Replace"
msgstr "ПоиÑк и замена"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2889,30 +2951,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "Копирование файлов..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "Ðе удалоÑÑŒ Ñоздать папку \"%s\""
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Ðе удалоÑÑŒ Ñоздать ÑимволичеÑкую ÑÑылку \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2921,7 +2983,7 @@ msgstr[1] "Ðе удалоÑÑŒ открыть %d файла"
msgstr[2] "Ðе удалоÑÑŒ открыть %d файлов"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "Ðе удалоÑÑŒ открыть %d файл"
@@ -2930,6 +2992,33 @@ msgstr "Ðе удалоÑÑŒ открыть %d файл"
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Ðе удалоÑÑŒ ÑоединитьÑÑ Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¾Ð¼ HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "ОÑобые дейÑтвиÑ"
@@ -3169,11 +3258,11 @@ msgstr ""
msgid "Unknown closing element <%s>"
msgstr "ÐеизвеÑтный закрывающий Ñлемент <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Ðе удалоÑÑŒ определить Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Команда не наÑтроена"
@@ -3224,3 +3313,87 @@ msgstr "Открыть папку Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Открыть выбранные папки в новых окнах"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "ÐавÑегда удалить выбранный файл"
+#~ msgstr[1] "ÐавÑегда удалить выбранные файлы"
+#~ msgstr[2] "ÐавÑегда удалить выбранные файлы"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Ðе удалоÑÑŒ изменить права Ð´Ð»Ñ \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "ПропуÑтить?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Ðе удалоÑÑŒ получить информацию о файле \"%s\": %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "Файл \"%s\" уже ÑущеÑтвует. Заменить его пуÑтым файлом?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Ðевозможно удалить \"%s\".\n"
+#~ "\n"
+#~ "ПропуÑтить?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Ðевозможно Ñоздать пуÑтой файл \"%s\".\n"
+#~ "\n"
+#~ "ПропуÑтить?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Ðе удалоÑÑŒ выполнить команду stat Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "ПерезапиÑать?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Ðе удалоÑÑŒ Ñоздать папку \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Удаление папок..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Ðе удалоÑÑŒ удалить папку \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "ПеремеÑтить корневой каталог невозможно"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Именованые каналы (named fifo) не поддерживаютÑÑ"
+
+#~ msgid "Operation canceled"
+#~ msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Ðе удалоÑÑŒ прочитать данные из \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Ðе удалоÑÑŒ изменить права \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Ðе удалоÑÑŒ cкопировать Ñпециальный файл \"%s\""
diff --git a/po/sv.po b/po/sv.po
index 986daebe74cb97eb1b3fbb48612978eed5e9b92d..57cf832e2ee4a2b1322902372a108934b3dfdd12 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-02-22 16:28+0100\n"
"Last-Translator: Alexander Toresson <alexander.toresson@gmail.com>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -17,373 +17,331 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Samlar in filer..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Vill du hoppa över den?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Misslyckades att fastställa filinformation för \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Misslyckades att ändra rättigheter för \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Misslyckades att ändra filägare för \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Misslyckades att ändra filgrupp för \"%s\": %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Filen \"%s\" existerar redan. Vill du ersätta den med en tom fil?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Misslyckades att ta bort \"%s\".\n"
-"\n"
-"Vill du hoppa över den?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Misslyckades att skapa tomma filen \"%s\".\n"
-"\n"
-"Vill du hoppa över den?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Kunde inte läsa in innehållet i katalogen"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Okänt fel"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Inget \"Exec\"-fält angivet"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Inget \"URL\"-fält angivet"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Ogiltig desktop-fil"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Misslyckades att tolka fil"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Ogiltigt filnamn"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Misslyckades att läsa status på \"%s\": %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"Vill du skriva över den?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Misslyckades att ta bort \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Misslyckades att läsa in program från fil %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Kommando"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "Kommandot för att köra mime-handtaget"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Flaggor"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Flaggorna för mime-handtaget"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Ikon"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Välj filer att byta namn på"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "Ikonen för mime-handtaget"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Förbereder..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Namn"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Misslyckades att ändra rättigheter för \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Namnet på mime-handtaget"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Misslyckades att ändra filägare för \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "%s dokument"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Misslyckades att ändra filgrupp för \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Misslyckades att skapa katalog \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Sökväg för lång för att passa i buffert"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI för lång för att passa i buffert"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Storlek"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Den önskade storleken för miniatyrbilder"
+msgid "The file \"%s\" already exists"
+msgstr "Filen \"%s\" existerar redan"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Tar bort kataloger..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Misslyckades att skapa namngivet rör \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Misslyckades att ta bort katalogen \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Kan inte överföra rotkatalogen"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Förbereder..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Misslyckades att öppna \"%s\" för läsning"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Ogiltig sökväg"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Misslyckades att öppna \"%s\" för skrivning"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Okänd användare \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "Misslyckades att skriva data till \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Misslyckades att fastställa monteringspunkten för %s"
+msgid "Failed to remove \"%s\""
+msgstr "Misslyckades att ta bort \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Kunde inte ansluta till HAL-demonen: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Misslyckades att läsa data från \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "kopia av %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "länk till %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "ytterligare en kopia av %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "ytterligare en länk till %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "tredje kopian av %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "tredje länken till %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "kopia nummer %u av %s"
msgstr[1] "kopia nummer %u av %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "länk nummer %u till %s"
msgstr[1] "länk nummer %u till %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Misslyckades att fastställa filinformation för \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Misslyckades att skapa katalogen \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Misslyckades att skapa namngivet rör \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "Namngedda pipes stödjs inte"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Misslyckades att öppna \"%s\" för läsning"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Misslyckades att skapa symbolisk länk \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Filen \"%s\" existerar redan"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Misslyckades att öppna \"%s\" för skrivning"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "Symboliska länkar stödjs inte"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Misslyckades att läsa data från \"%s\""
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Filsystem"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Misslyckades att byta namn på \"%s\" till \"%s\"."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Misslyckades att byta namn på \"%s\" till \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Misslyckades att byta namn på \"%s\" till \"%s\"."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "Sökvägen \"%s\" refererar inte till en katalog"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Misslyckades att skriva data till \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "Misslyckades att läsa in program från fil %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Misslyckades att ta bort \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "Misslyckades att ta bort \"%s\": %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Operationen avbröts"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Kommando"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Misslyckades att läsa länkmål från \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "Kommandot för att köra mime-handtaget"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Flaggor"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Flaggorna för mime-handtaget"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Ikon"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "Ikonen för mime-handtaget"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Namn"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Namnet på mime-handtaget"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Misslyckades att skapa symbolisk länk \"%s\""
+msgid "%s document"
+msgstr "%s dokument"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Misslyckades att ändra rättigheter på \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "Symboliska länkar stödjs inte"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Sökväg för lång för att passa i buffert"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI för lång för att passa i buffert"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Storlek"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Den önskade storleken för miniatyrbilder"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Samlar in filer..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Ogiltig sökväg"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Misslyckades att fastställa filinformation för \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "Okänd användare \"%s\""
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "Misslyckades att fastställa monteringspunkten för %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Misslyckades att kopiera specialfil \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Kunde inte ansluta till HAL-demonen: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -500,58 +458,148 @@ msgid "Sort items in descending order"
msgstr "Sortera objekt i fallande ordning"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Misslyckades att starta operation"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Misslyckades att öppna \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Misslyckades att öppna \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "Kopierar filer..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Skapar symboliska länkar..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "Flyttar filer..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "Flyttar filer..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Är du säker att du vill\n"
+"permanent ta bort \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Är du säker att du vill permanent\n"
+"ta bort den markerade filen?"
+msgstr[1] ""
+"Är du säker att du vill permanent\n"
+"ta bort de markerade filerna?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Om du tar bort en fil är den permanent förlorad."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Tar bort filer..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Skapar filer..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Skapar kataloger..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "_Tom fil"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Misslyckades att fastställa monteringspunkten för %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Skapa en ny mapp i \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Skapa _mapp..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Misslyckades att ta bort \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Tar bort filer..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Misslyckades att ställa in standardprogram för \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Inget program valt"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -560,20 +608,20 @@ msgstr ""
"\"%s\". "
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Annat program..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Öppna med"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "Använd ett _anpassat kommando:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -582,40 +630,39 @@ msgstr ""
"listan ovan."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "_Bläddra..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "Använd som _standardval för den här typen av fil"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Misslyckades att lägga till nya programmet \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Misslyckades att köra \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "_Ta bort genväg"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Öppna <i>%s</i> och andra filer av typen \"%s\" med:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -623,20 +670,19 @@ msgstr ""
"Bläddra i filsystemet för att välja ett program att använda för att öppna "
"filer av typen \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr "Ändra standardvalet av program som öppnar filer av typen \"%s\""
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "Är du säker att du vill ta bort \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -650,39 +696,39 @@ msgstr ""
"Du kan bara ta bort programgenvägar som skapades med Anpassat Kommando-valet "
"i \"Öppna med\"-dialogen i filhanteraren."
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Välj ett program"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "Alla filer"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Körbara filer"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perl-skript"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Python-skript"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Ruby-skript"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shellskript"
@@ -702,7 +748,7 @@ msgid "Other Applications"
msgstr "Andra program"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Det finns inget i Urklipp att klistra in"
@@ -770,14 +816,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "_Expandera kolumnerna automatiskt vid behov"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Okänd"
@@ -789,7 +836,7 @@ msgstr "Kompakt kataloglistning"
msgid "Compact view"
msgstr "Kompakt vy"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Ange det nya namnet:"
@@ -815,7 +862,7 @@ msgstr "Detaljerad kataloglistning"
msgid "Details view"
msgstr "Detaljerad vy"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr ""
"Daniel Nylander <po@danielnylander.se>\n"
@@ -823,10 +870,26 @@ msgstr ""
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Misslyckades att öppna hjälpläsaren"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Ja"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Ja till _alla"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_Nej"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_Avbryt"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Kopiera hit"
@@ -881,7 +944,7 @@ msgstr "Ägare"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Behörigheter"
@@ -897,14 +960,10 @@ msgstr "Fil"
msgid "File Name"
msgstr "Filnamn"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Rotmappen har ingen förälder"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Filsystem"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -940,14 +999,14 @@ msgstr "Ikonvy"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Öppna"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Öppna i nytt fönster"
@@ -1083,12 +1142,12 @@ msgid_plural "Send the selected files to \"%s\""
msgstr[0] "Öppna de markerade filerna"
msgstr[1] "Öppna de markerade filerna"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "trasig länk"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1096,83 +1155,101 @@ msgstr[0] "%d objekt (%s), Ledigt utrymme: %s"
msgstr[1] "%d objekt (%s), Ledigt utrymme: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d objekt, Ledigt utrymme: %s"
msgstr[1] "%d objekt, Ledigt utrymme: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d objekt"
msgstr[1] "%d objekt"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" trasig länk"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) länk till %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr ""
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "%d objekt markerat (%s)"
msgstr[1] "%d objekt markerade (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "%d objekt markerat"
msgstr[1] "%d objekt markerade"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Mellanrum"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Mellanrummets storlek mellan sökvägsknappar"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Öppna \"%s\" i det här fönstret"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Öppna \"%s\" i ett nytt fönster"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Skapa en ny mapp i \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Skapa _mapp..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1180,29 +1257,29 @@ msgstr ""
"Flytta eller kopiera filer som tidigare har klippts ut eller kopierats in i "
"\"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Klistra in i mapp"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "Visa egenskaperna för mapp \"%s\""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "_Egenskaper"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Ny mapp"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Skapa ny mapp"
@@ -1219,11 +1296,11 @@ msgstr "_Plats:"
msgid "Failed to launch \"%s\""
msgstr "Misslyckades att starta \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Ikonstorlek"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Ikonstorleken för sökvägen"
@@ -1305,17 +1382,15 @@ msgid "Stop applying permissions recursively."
msgstr "Sluta verkställa rättigheter rekursivt."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "Fråga"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "Verkställ rekursivt?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1324,11 +1399,11 @@ msgstr ""
"Vill du verkställa dina ändringar rekursivt till alla\n"
"filer och undermappar under den markerade mappen?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "Fråga mig i_nte igen"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1339,29 +1414,29 @@ msgstr ""
"ändra dina val senare."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Misslyckades att byta grupp"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Misslyckades att verkställa de nya rättigheterna"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "Okänd filägare"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Rätta automatiskt till mapprättigheterna?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "Rätta till mapprättigheterna"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1371,77 +1446,57 @@ msgstr ""
"som tillåts att läsa innehållet i den här mappen kommer att tillåtas åtkomst "
"till mappen efteråt."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Ja"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Ja till _alla"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_Nej"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_Avbryt"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Inställningar för filhanteraren"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Vyer"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Standardvy"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Visa _nya mappar med:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Ikonvy"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Detaljerad listvy"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Kompakt listvy"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "Senaste aktiva vy"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Sortera _mappar före filer"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"Välj det här alternativet för att lista mappar före filer när du sorterar en "
"mapp."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Visa _miniatyrbilder"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1449,11 +1504,11 @@ msgstr ""
"Välj det här alternativet för att visa filer som kan förhandsgranskas inom "
"en mapp som automatiskt genererade miniatyrbildsikoner."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_Text bredvid ikoner"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1464,58 +1519,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Sidopanel"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Genvägar"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_Ikonstorlek:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Minst"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Mindre"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Liten"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Normal"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Stor"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Större"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Störst"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Visa _emblemikoner"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1523,19 +1578,19 @@ msgstr ""
"Välj den här inställninger för att visa emblemikoner i genvägslistan för "
"allafiler för vilka emblem har definierats i filegenskapsdialogen."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Trädvyn"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Ikon_storlek:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Visa _emblemikoner"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1546,16 +1601,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Beteende"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "_Enkelklicka för att aktivera ett objekt"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1563,7 +1621,7 @@ msgstr ""
"Ange _fördröjningen innan ett objekt väljs\n"
"när muspekaren vilar ovanpå det:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1577,34 +1635,34 @@ msgstr ""
"vara användbar när enkelklick aktiverar objekt, och du vill välja ett objekt "
"utan att aktivera det."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Avstängd"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "Medium"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "LÃ¥ng"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "_Dubbelklicka för att aktivera ett objekt"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Avancerat"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Katalogbehörigheter"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1614,173 +1672,178 @@ msgstr ""
"du också ändra behörigheterna på innehållet i\n"
"katalogen. Välj standardbeteendet nedan:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Fråga alltid"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "Ändra endast behörigheterna på katalogen"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "Ändra behörigheterna på både katalogen och dess innehåll"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu timme återstår)"
msgstr[1] "(%lu timmar återstår)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu minut återstår)"
msgstr[1] "(%lu minuter återstår)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(%lu sekund återstår)"
msgstr[1] "(%lu sekunder återstår)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Allmänt"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Namn:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Sort:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Öppna med:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Länkmål:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "_Ta bort"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Ändrad:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "Ã…tkommen:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Storlek:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Volym:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Ledigt utrymme:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Emblem"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - Egenskaper..."
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Misslyckades att byta namn på \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Arkiv"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "Filkontextmeny"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Lägg till filer..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Lägg till fler filer i listan över filer som ska döpas om"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "Töm"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "Tömmer fillistan nedan"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Om"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Visa information om Thunars massomdöpningsverktyg"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "_Egenskaper..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "Visa egenskaper för den markerade filen"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "Byt namn på flera filer"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Byt namn på filer"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "Klicka här för att byta namn på filerna i listan ovan"
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Nytt namn"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
"Klicka här för att visa dokumentationen för den valda omdöpningsoperationen"
@@ -1788,7 +1851,7 @@ msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1800,30 +1863,30 @@ msgstr ""
"\"-insticksmodulen."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Välj filer att byta namn på"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Ljudfiler"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "Bildfiler"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Videofiler"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "Massomdöpning"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1832,20 +1895,20 @@ msgstr ""
"utökningsbart verktyg som kan byta namn på\n"
"flera filer på en gång."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Ta bort fil"
msgstr[1] "Ta bort filer"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Ta bort den valda filen från listan över filer att döpas om"
msgstr[1] "Ta bort de valda filerna från lista över filer att döpas om"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "Massomdöpning - Byt namn på flera filer"
@@ -1893,120 +1956,120 @@ msgstr[0] "Lägg till markerad mapp till sidopanelen med genvägar"
msgstr[1] "Lägg till markerade mappar till sidopanelen med genvägar"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Montera volym"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "Mata _ut volym"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_Avmontera volym"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "_Ta bort genväg"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Byt _namn på genväg"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "Sökvägen \"%s\" refererar inte till en katalog"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Misslyckades att lägga till ny genväg"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Misslyckades att mata ut \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Misslyckades att montera \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Misslyckades att avmontera \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "Klicka här för att avbryta kalkyleringen av storleken på mappen"
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "Kalkylering avbruten"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "Kalkylerar..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s byte"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u objekt, totalt %s"
msgstr[1] "%u objekt, totalt %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "Mappkontextmeny"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Skapa en tom mapp i aktuell mapp"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "Kli_pp ut"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Kopiera"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "_Klistra in"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"Flytta eller kopiera filer som tidigare har valts genom att du klippte ut "
"eller kopierade dem."
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "_Ta bort"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2014,156 +2077,143 @@ msgstr ""
"Flytta eller kopiera filer, som tidigare har valts genom att du klippte ut "
"eller kopierade dem, in i den valda katalogen"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Markera _alla filer"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Markera alla filer i det här fönstret"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Markera _efter mönster..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Markera alla filer som matchar ett specifikt mönster"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Du_plicera"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "S_kapa länk"
msgstr[1] "S_kapa länkar"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "_Byt namn..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Byt namn på markerad fil"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Skapa _dokument"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Läser in mappinnehåll..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Ny tom fil"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Ny tom fil..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Skapa dokument från mallen \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Är du säker att du vill\n"
-"permanent ta bort \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Är du säker att du vill permanent\n"
-"ta bort den markerade filen?"
-msgstr[1] ""
-"Är du säker att du vill permanent\n"
-"ta bort de markerade filerna?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Om du tar bort en fil är den permanent förlorad."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Välj efter mönster"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "_Välj"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Mönster:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Byt namn på \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Misslyckades att skapa en länk för URL-en \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Misslyckades att öppna katalogen \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "Förbered den valda filen för att bli flyttad genom inklistring"
msgstr[1] "Förbered de valda filerna för att bli flyttade genom inklistring"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "Förbered den valda filen för att bli kopierad genom inklistring"
msgstr[1] "Förbered de valda filerna för att bli kopierad genom inklistring"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "Ta bort den markerade filen permanent"
-msgstr[1] "Ta bort de markerade filerna permanent"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Duplicera den valda filen"
+msgstr[1] "Duplicera de valda filerna"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Duplicera den valda filen"
msgstr[1] "Duplicera de valda filerna"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Skapa en symbolisk länk för den valda filen"
msgstr[1] "Skapa en symbolisk länk för varje markerad fil"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Byt namn på markerad fil"
+msgstr[1] "Byt namn på markerad fil"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Byt namn på markerad fil"
+msgstr[1] "Byt namn på markerad fil"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Skapa"
@@ -2182,20 +2232,30 @@ msgstr "Inga mallar installerade"
msgid "_Empty File"
msgstr "_Tom fil"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "Läser in..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "_Klistra in filer i mapp"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "_Egenskaper..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Öppna nytt _fönster"
@@ -2621,23 +2681,23 @@ msgid "Shutter Speed:"
msgstr ""
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr ""
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2811,39 +2871,39 @@ msgstr ""
msgid "Search & Replace"
msgstr "Sök och ersätt"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2853,30 +2913,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "Kopierar filer..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "Misslyckades att skapa katalogen \"%s\""
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Misslyckades att skapa symbolisk länk \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2884,7 +2944,7 @@ msgstr[0] "Misslyckades att öppna filen %d"
msgstr[1] "Misslyckades att öppna filerna %d"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "Misslyckades att öppna filen %d"
@@ -2893,6 +2953,33 @@ msgstr "Misslyckades att öppna filen %d"
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Kunde inte ansluta till HAL-demonen: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "Anpassade åtgärder"
@@ -3129,11 +3216,11 @@ msgstr "Slutelementhandtag anropad inne i rotkontext"
msgid "Unknown closing element <%s>"
msgstr "Okänt avslutselement <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Misslyckades att fastställa plats för att spara uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Kommando inte konfigurerat"
@@ -3184,3 +3271,86 @@ msgstr "Öppna katalog med Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Öppna de markerade katalogerna i Thunar"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "Ta bort den markerade filen permanent"
+#~ msgstr[1] "Ta bort de markerade filerna permanent"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Misslyckades att ändra rättigheter för \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Vill du hoppa över den?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Misslyckades att fastställa filinformation för \"%s\": %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "Filen \"%s\" existerar redan. Vill du ersätta den med en tom fil?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Misslyckades att ta bort \"%s\".\n"
+#~ "\n"
+#~ "Vill du hoppa över den?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Misslyckades att skapa tomma filen \"%s\".\n"
+#~ "\n"
+#~ "Vill du hoppa över den?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Misslyckades att läsa status på \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Vill du skriva över den?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Misslyckades att skapa katalog \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Tar bort kataloger..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Misslyckades att ta bort katalogen \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Kan inte överföra rotkatalogen"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "Namngedda pipes stödjs inte"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Operationen avbröts"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Misslyckades att läsa länkmål från \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Misslyckades att ändra rättigheter på \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Misslyckades att kopiera specialfil \"%s\""
diff --git a/po/uk.po b/po/uk.po
index 4378934ddcfeeb48c44f4b388695f95746d581eb..508a30564e78c60b5a121b6ad533145f97f3ab91 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-04-20 17:07+0300\n"
"Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -17,279 +17,139 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "Ð—Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"ПропуÑтити?"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "Ðе вдаєтьÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ інформацію про файл \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права доÑтупу до \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права Ð´Ð»Ñ \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ влаÑника файлу \"%s\": %s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "Файл \"%s\" вже Ñ–Ñнує. замінити його порожнім файлом?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Ðе вдаєтьÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\".\n"
-"\n"
-"ПропуÑтити?"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"Ðе вдаєтьÑÑ Ñтворити порожній файл \"%s\".\n"
-"\n"
-"ПропуÑтити?"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "Ðе вдаєтьÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ зміÑÑ‚ теки"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "Ðевідома помилка"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Ðе вказано поле Exec"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "Ðе вказано URL"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "Ðекоректний файл .desktop"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "Ðе вдаєтьÑÑ Ñ€Ð¾Ð·Ñ–Ð±Ñ€Ð°Ñ‚Ð¸ файл"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "Ðеправильна назва файлу"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "Ðе вдаєтьÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ команду stat Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñƒ \"%s\": %s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"ПерезапиÑати?"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "Ðе вдаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ програму з файлу %s"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "Команда"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "Команда, що запуÑкаєтьÑÑ Ð´Ð»Ñ Ð¾Ð±Ñ€Ð¾Ð±ÐºÐ¸ даного типу MIME"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "Ключі"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "Ключі обробника MIME"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "Значок"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "Виберіть файли Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "Значок обробника MIME"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "Підготовка..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "Ðазва"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права доÑтупу до \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "Ðазва заголовка MIME"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права Ð´Ð»Ñ \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "Документ %s"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ влаÑника файлу \"%s\": %s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "Ðе вдаєтьÑÑ Ñтворити каталог \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "Ðадто довгий шлÑÑ…, що уміÑтити його в буфері"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "Ðадто довгий URI, що уміÑтити його в буфері"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "Розмір"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "Бажаний розмір мініатюр"
+msgid "The file \"%s\" already exists"
+msgstr "Файл \"%s\" вже Ñ–Ñнує"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ‚ÐµÐº..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ñтворити канал (fifo) \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "Ðе вдаєтьÑÑ Ñтворити теку \"%s\": %s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "Ðе можна переміщувати кореневий каталог"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "Підготовка..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\" Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "Ðеправильний шлÑÑ…"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\" Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "Ðевідомий кориÑтувач \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "Помилка запиÑу даних у \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ точку Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ %s"
+msgid "Failed to remove \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "Ðе вдаєтьÑÑ Ð·'єднатиÑÑ Ð·Ñ– Ñлужбою HAL: %s"
+msgid "Failed to read data from \"%s\""
+msgstr "Помилка Ð·Ñ‡Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… з \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "ÐºÐ¾Ð¿Ñ–Ñ %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "інша ÐºÐ¾Ð¿Ñ–Ñ %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "інше поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "Ñ‚Ñ€ÐµÑ‚Ñ ÐºÐ¾Ð¿Ñ–Ñ %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "третє поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° %s"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
@@ -297,7 +157,7 @@ msgstr[0] "%u-а ÐºÐ¾Ð¿Ñ–Ñ %s"
msgstr[1] "%u-а ÐºÐ¾Ð¿Ñ–Ñ %s"
msgstr[2] "%u-а ÐºÐ¾Ð¿Ñ–Ñ %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
@@ -305,89 +165,186 @@ msgstr[0] "%u-е поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° %s"
msgstr[1] "%u-е поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° %s"
msgstr[2] "%u-е поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° %s"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ інформацію про файл \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "Ðе вдаєтьÑÑ Ñтворити каталог \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "Ðе вдаєтьÑÑ Ñтворити канал (fifo) \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
+#, c-format
+msgid "Failed to create symbolic link \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
#, fuzzy
-msgid "Named pipes are not supported"
+msgid "Symbolic links are not supported"
msgstr "ЗапуÑкати Ñк Ñлужбу (не підтримуєтьÑÑ)"
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
-#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\" Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "Файлова ÑиÑтема"
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "Файл \"%s\" вже Ñ–Ñнує"
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\" на \"%s\"."
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\" Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу"
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "Помилка Ð·Ñ‡Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… з \"%s\""
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\" на \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\" на \"%s\"."
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "ШлÑÑ… \"%s\" не вказує на теку"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "Помилка запиÑу даних у \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "Ðе вдаєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ програму з файлу %s"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\": %s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "Операцію ÑкаÑовано"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "Команда"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "Ðеможливо прочитати ціль поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "Команда, що запуÑкаєтьÑÑ Ð´Ð»Ñ Ð¾Ð±Ñ€Ð¾Ð±ÐºÐ¸ даного типу MIME"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "Ключі"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "Ключі обробника MIME"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "Значок"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "Значок обробника MIME"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "Ðазва"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "Ðазва заголовка MIME"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "Ðе вдаєтьÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\""
+msgid "%s document"
+msgstr "Документ %s"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права \"%s\""
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-#, fuzzy
-msgid "Symbolic links are not supported"
-msgstr "ЗапуÑкати Ñк Ñлужбу (не підтримуєтьÑÑ)"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "Ðадто довгий шлÑÑ…, що уміÑтити його в буфері"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "Ðадто довгий URI, що уміÑтити його в буфері"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "Розмір"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "Бажаний розмір мініатюр"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "Ð—Ð±Ð¸Ñ€Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²..."
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "Ðеправильний шлÑÑ…"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ інформацію про файл \"%s\""
+msgid "Unknown user \"%s\""
+msgstr "Ðевідомий кориÑтувач \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "Ðе вдаєтьÑÑ Ñкопіювати Ñпеціальний файл \"%s\""
+msgid "Failed to determine the mount point for %s"
+msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ точку Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ %s"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#, c-format
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "Ðе вдаєтьÑÑ Ð·'єднатиÑÑ Ð·Ñ– Ñлужбою HAL: %s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -504,58 +461,151 @@ msgid "Sort items in descending order"
msgstr "Сортувати за ÑпаданнÑм"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "Ðе вдаєтьÑÑ Ð·Ð°Ð¿ÑƒÑтити операцію"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñимволічних поÑилань..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "ÐŸÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "ÐŸÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"Ви дійÑно бажаєте\n"
+"оÑтаточно видалити \"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"Ви дійÑно бажаєте оÑтаточно\n"
+"оÑтаточно видалити %u виділений файлів?"
+msgstr[1] ""
+"Ви дійÑно бажаєте оÑтаточно\n"
+"оÑтаточно видалити %u виділених файли?"
+msgstr[2] ""
+"Ви дійÑно бажаєте оÑтаточно\n"
+"оÑтаточно видалити %u виділених файлів?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "Якщо ви видалите файл, він буде оÑтаточно втрачений."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñ–Ð²..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "_Порожній файл"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ точку Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ %s"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "Створити нову теку у \"%s\""
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "Створити _теку..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ типову програму Ð´Ð»Ñ \"%s\""
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "Програму не вибрано"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
@@ -564,20 +614,20 @@ msgstr ""
"файлів цього типу \"%s\"."
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "_Інша програма..."
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "Відкрити за допомогою"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "ВикориÑтовувати _команду:"
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
@@ -586,41 +636,40 @@ msgstr ""
"ÑпиÑку."
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "О_глÑд..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "ВикориÑтовувати цю програму Ð´Ð»Ñ Ð²Ñ–Ð´ÐºÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² цього _типу"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ нову програму \"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ \"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
#, fuzzy
msgid "_Remove Launcher"
msgstr "Значок запуÑку"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "Відкривати <i>%s</i> та інші файли типу \"%s\" викориÑтовуючи:"
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
@@ -628,22 +677,21 @@ msgstr ""
"ПереглÑнути файлову ÑиÑтему, Ð´Ð»Ñ Ð²Ð¸Ð±Ð¾Ñ€Ñƒ програми, Ñка буде викориÑтовуватиÑÑŒ "
"Ð´Ð»Ñ Ð²Ñ–Ð´ÐºÑ€Ð¸Ð²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² типу \"%s\"."
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr "Змінити типову програму Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² типу \"%s\"."
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, fuzzy, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr ""
"Ви дійÑно бажаєте\n"
"оÑтаточно видалити \"%s\"?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -652,39 +700,39 @@ msgid ""
"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "Виберіть програму"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "УÑÑ– файли"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "Виконувані файли"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Сценарії Perl"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Сценарії Python"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Сценарії Ruby"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Сценарії оболонки"
@@ -704,7 +752,7 @@ msgid "Other Applications"
msgstr "Інші програми"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "Буфер обміну порожній"
@@ -772,14 +820,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "_Ðвтоматично збільшувати ширину Ñтовпчиків при необхідноÑÑ‚Ñ–"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "Ðевідомо"
@@ -791,7 +840,7 @@ msgstr "Компактний ÑпиÑок"
msgid "Compact view"
msgstr "Компактний виглÑд"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "Введіть нову назву:"
@@ -817,16 +866,32 @@ msgstr "Докладний ÑпиÑок"
msgid "Details view"
msgstr "ПереглÑд у виглÑді ÑпиÑку"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "МакÑим Дзюманенко <mvd@mylinux.ua>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ програму Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду документації"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "_Так"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "Так Ð´Ð»Ñ _уÑÑ–Ñ…"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "_ÐÑ–"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "_СкаÑувати"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "_Копіювати Ñюди"
@@ -881,7 +946,7 @@ msgstr "ВлаÑник"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "Права"
@@ -897,14 +962,10 @@ msgstr "Файл"
msgid "File Name"
msgstr "Ðазва файлу"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "Кореневий каталог не має батьківÑького каталогу"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "Файлова ÑиÑтема"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -940,14 +1001,14 @@ msgstr "ПереглÑд у виглÑді значків"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "_Відкрити"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "Відкрити у новому вікні"
@@ -1094,12 +1155,12 @@ msgstr[0] "Відкрити виділені файли"
msgstr[1] "Відкрити виділені файли"
msgstr[2] "Відкрити виділені файли"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "неправильне поÑиланнÑ"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
@@ -1108,7 +1169,7 @@ msgstr[1] "%d об'єкти (%s), вільного проÑтору: %s"
msgstr[2] "%d об'єктів (%s), вільного проÑтору: %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
@@ -1116,7 +1177,7 @@ msgstr[0] "%d об'єкт, вільного проÑтору: %s"
msgstr[1] "%d об'єкти, вільного проÑтору: %s"
msgstr[2] "%d об'єктів, вільного проÑтору: %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
@@ -1124,22 +1185,36 @@ msgstr[0] "%d елемент"
msgstr[1] "%d елементи"
msgstr[2] "%d елементів"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" неправильне поÑиланнÑ"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) поÑилаєтьÑÑ Ð½Ð° %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "Розмір:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
@@ -1147,7 +1222,7 @@ msgstr[0] "виділено %d об'єкт (%s)"
msgstr[1] "виділено %d об'єкти (%s)"
msgstr[2] "виділено %d об'єктів (%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
@@ -1155,40 +1230,44 @@ msgstr[0] "виділено %d об'єкт"
msgstr[1] "виділено %d об'єкти"
msgstr[2] "виділено %d об'єктів"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "Інтервал"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "Розмір проміжку між двома кнопками у панелі шлÑху"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "Відкрити \"%s\" у цьому вікні"
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "Відкрити \"%s\" у новому вікні"
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "Створити нову теку у \"%s\""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "Створити _теку..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
@@ -1196,30 +1275,30 @@ msgstr ""
"ПереміÑтити чи Ñкопіювати файли, що виділені командою \"Вирізати\" чи "
"\"Копіювати\", у \"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "Ð’Ñтавити у теку"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, fuzzy, c-format
msgid "View the properties of the folder \"%s\""
msgstr "ПереглÑнути влаÑтивоÑÑ‚Ñ– виділеного файлу"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
#, fuzzy
msgid "_Properties"
msgstr "Ð’_лаÑтивоÑÑ‚Ñ–..."
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "Ðова тека"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "Створити нову теку"
@@ -1236,11 +1315,11 @@ msgstr "_ÐдреÑа:"
msgid "Failed to launch \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð·Ð°Ð¿ÑƒÑтити \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "Розмір значків"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "Розмір значків Ð´Ð»Ñ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ñƒ в панелі шлÑху"
@@ -1322,17 +1401,15 @@ msgid "Stop applying permissions recursively."
msgstr "Зупинити рекурÑивну зміну прав."
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "ПитаннÑ"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "ЗаÑтоÑувати рекурÑивно?"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1341,11 +1418,11 @@ msgstr ""
"Бажаєте рекурÑивно заÑтоÑувати зміни\n"
"до уÑÑ–Ñ… файлів та тек у вибраній теці?"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "_Ðе питати надалі"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1355,29 +1432,29 @@ msgstr ""
"змінити ваш вибір у вікні параметрів."
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ групу"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "Ðе вдаєтьÑÑ Ð·Ð°ÑтоÑувати нові права"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "ВлаÑник файлу невідомий"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "Ðвтоматично виправлÑти права Ð´Ð»Ñ Ñ‚ÐµÐºÐ¸?"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "ВиправлÑти права Ð´Ð»Ñ Ñ‚ÐµÐºÐ¸"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1386,76 +1463,56 @@ msgstr ""
"Права Ð´Ð»Ñ Ñ‚ÐµÐºÐ¸ будуть виправлені автоматично. Лише кориÑтувачі, Ñким "
"дозволено Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð·Ð¼Ñ–Ñту теки, зможуть Ñ—Ñ— відкрити."
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "_Так"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "Так Ð´Ð»Ñ _уÑÑ–Ñ…"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "_ÐÑ–"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "_СкаÑувати"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "Параметри менеджера файлів"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "Режим переглÑду"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "Типовий режим переглÑду"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "Відображати _нові теки викориÑтовуючи:"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "Режим переглÑду: значки"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "Режим переглÑду: ÑпиÑок"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "Режим переглÑду: ÑпиÑок"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "ОÑтанній _активний режим переглÑду"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "Відображати _теки перед файлами"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr ""
"ВикориÑтовуйте цей параметр, щоб увімкнути Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ñ‚ÐµÐº перед файлами."
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "Показувати _мініатюри"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
@@ -1463,11 +1520,11 @@ msgstr ""
"Відмітьте цей параметр Ð´Ð»Ñ Ð²Ð¼Ð¸ÐºÐ°Ð½Ð½Ñ Ð¿Ð¾ÐºÐ°Ð·Ñƒ мініатюр Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð², Ð´Ð»Ñ Ñких це "
"можливо."
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "_ТекÑÑ‚ поруч зі значками"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1478,58 +1535,58 @@ msgstr ""
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "Бічна панель"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "Панель закладок"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "_Розмір значків:"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "Дуже малий"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "Менший"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "Маленький"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "Звичайний"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "Великий"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "Більший"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "Дуже великий"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "Відображати _емблеми на значках"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1537,19 +1594,19 @@ msgstr ""
"Відмітьте цей параметр, щоб відображувати емблеми на значках у панелі "
"закладок."
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "Дерео"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "Розмір _значків:"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "Відображати е_мблеми на значках"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1558,16 +1615,19 @@ msgstr "Відмітьте цей параметр, щоб відображат
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "Поведінка"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ñ–Ñ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ñ–Ð² _одинарним клацаннÑм"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1575,7 +1635,7 @@ msgstr ""
"Вкажіть _затримку перш ніж об'єкт буде виділений\n"
"при утримуванні над ним вказівника миші:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1589,34 +1649,34 @@ msgstr ""
"об'єкти, а вам потрібно вибрати об'єкт без його активації. Ви можете "
"вимкнути цей режим розміÑтивши повзунок у крайню ліву позицію."
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "Вимкнено"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "СереднÑ"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "Велика"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ñ–Ñ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ñ–Ð² _подвійним клацаннÑм"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "Додатково"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "Права"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1626,19 +1686,19 @@ msgstr ""
"заÑтоÑувати зміни до Ñ—Ñ— вміÑту. Виберіть\n"
"типову поведінку:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "Запитувати щоразу"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "ЗаÑтоÑовувати лише до Ñамої теки"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "ЗаÑтоÑувати до теки та Ñ—Ñ— зміÑту"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
@@ -1646,7 +1706,7 @@ msgstr[0] "(залишилаÑÑŒ %lu година)"
msgstr[1] "(залишилоÑÑŒ %lu години)"
msgstr[2] "(залишилоÑÑŒ %lu годин)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
@@ -1654,7 +1714,7 @@ msgstr[0] "(залишилаÑÑŒ %lu хвилина)"
msgstr[1] "(залишилоÑÑŒ %lu хвилини)"
msgstr[2] "(залишилоÑÑŒ %lu хвилин)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
@@ -1662,141 +1722,146 @@ msgstr[0] "(залишилаÑÑŒ %lu Ñекунда)"
msgstr[1] "(залишилоÑÑŒ %lu Ñекунди)"
msgstr[2] "(залишилоÑÑŒ %lu Ñекунд)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "Загальне"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "Ðазва:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "Тип:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "Відкрити програмою:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "Ціль поÑиланнÑ:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "В_идалити"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "Змінено:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "ДоÑтуп:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "Розмір:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "Том:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "Вільного міÑцÑ:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "Емблеми"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, fuzzy, c-format
msgid "%s - Properties"
msgstr "Ð’_лаÑтивоÑÑ‚Ñ–..."
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "_Файл"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "КонтекÑтне меню файлу"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "_Додати файли..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "Включити додаткові файли у ÑпиÑок Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "ОчиÑтити"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "ОчиÑтити ÑпиÑок"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "_Про програму"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "Показати інформацію про інÑтрумент Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² Thunar"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "Ð’_лаÑтивоÑÑ‚Ñ–..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "ПереглÑнути влаÑтивоÑÑ‚Ñ– виділеного файлу"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ð´ÐµÐºÑ–Ð»ÑŒÐºÐ° файлів"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "_Перейменувати файли"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
"ÐатиÑніть, щоб виконати Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð², що знаходÑÑ‚ÑŒÑÑ Ñƒ цьому ÑпиÑку."
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "Ðова назва"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr ""
"ÐатиÑніть, щоб переглÑнути документацію з вибраної операції перейменуваннÑ."
@@ -1804,7 +1869,7 @@ msgstr ""
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1816,30 +1881,30 @@ msgstr ""
"переконайтеÑÑŒ, що увімкнено Ñ€Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ \"ПроÑте вбудоване перейменуваннÑ\"."
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "Виберіть файли Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "Звукові файли"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "ЗображеннÑ"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "Відео файли"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "МаÑове перейменуваннÑ"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1847,14 +1912,14 @@ msgstr ""
"МаÑове Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² - це потужний інÑтрумент з можливоÑÑ‚Ñми "
"Ñ€Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ñ‡Ð°Ñного Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÑ–Ð»ÑŒÐºÐ¾Ñ… файлів."
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "Видалити файл"
msgstr[1] "Видалити файли"
msgstr[2] "Видалити файли"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "Видалити виділений файл зі ÑпиÑку Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ"
@@ -1862,7 +1927,7 @@ msgstr[1] "Видалити виділені файли зі ÑпиÑку длÑ
msgstr[2] "Видалити виділені файли зі ÑпиÑку Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "МаÑове перейменуваннÑ"
@@ -1911,82 +1976,82 @@ msgstr[1] "Додати вибрані теки до закладки на бі
msgstr[2] "Додати вибрані теки до закладки на бічній панелі"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "_Підключити том"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "Вит_Ñгнути том"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "_Відключити том"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "В_идалити закладку"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "Пере_йменувати закладку"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "ШлÑÑ… \"%s\" не вказує на теку"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "Ðе вдаєтьÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ нову закладку"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ñ‚Ñгнути \"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ \"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ \"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
#, fuzzy
msgid "Click here to stop calculating the total size of the folder."
msgstr "ÐатиÑніть, щоб автоматично виправити права Ð´Ð»Ñ Ñ‚ÐµÐºÐ¸."
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
#, fuzzy
msgid "Calculation aborted"
msgstr "ОбчиÑленнÑ..."
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "ОбчиÑленнÑ..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s байт"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
@@ -1994,40 +2059,40 @@ msgstr[0] "%u об'єкт, обчиÑÐ»ÐµÐ½Ð½Ñ Ð¾Ð±'єму %s"
msgstr[1] "%u об'єкти, обчиÑÐ»ÐµÐ½Ð½Ñ Ð¾Ð±'єму %s"
msgstr[2] "%u об'єктів, обчиÑÐ»ÐµÐ½Ð½Ñ Ð¾Ð±'єму %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "КонтекÑтне меню теки"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "Створити порожню теку у поточній теці"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "_Вирізати"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "_Копіювати"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "Ð’ÑÑ‚_авити"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr ""
"ПереміÑтити чи Ñкопіювати файли, що виділені командою \"Вирізати\" чи "
"\"Копіювати\""
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "В_идалити"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
@@ -2035,165 +2100,151 @@ msgstr ""
"ПереміÑтити чи Ñкопіювати у вибрану теку, що виділені файли командою "
"\"Вирізати\" чи \"Копіювати\""
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "Виділити вÑ_Ñ– файли"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "Виділити вÑÑ– файли у цьому вікні"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "Виділити за _шаблоном..."
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "Виділити уÑÑ– файли, що відповідають заданому шаблону"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "Створити к_опію файлу"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "Створити _поÑиланнÑ"
msgstr[1] "Створити _поÑиланнÑ"
msgstr[2] "Створити _поÑиланнÑ"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "Перей_менувати..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "Перейменувати вибраний файл"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "Створити _документ"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ñту теки..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "Ðовий файл"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "Ðовий файл..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "Створити документ з шаблону \"%s\""
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"Ви дійÑно бажаєте\n"
-"оÑтаточно видалити \"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"Ви дійÑно бажаєте оÑтаточно\n"
-"оÑтаточно видалити %u виділений файлів?"
-msgstr[1] ""
-"Ви дійÑно бажаєте оÑтаточно\n"
-"оÑтаточно видалити %u виділених файли?"
-msgstr[2] ""
-"Ви дійÑно бажаєте оÑтаточно\n"
-"оÑтаточно видалити %u виділених файлів?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "Якщо ви видалите файл, він буде оÑтаточно втрачений."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "Ð’Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ Ð·Ð° шаблоном"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "Виді_лити"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "_Шаблон:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "Перейменувати \"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, fuzzy, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "Ðе вдаєтьÑÑ Ñтворити канал (fifo) \"%s\""
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ теку \"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "Підготувати виділений файл до Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ \"Ð’Ñтавити\""
msgstr[1] "Підготувати виділені файли до Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ \"Ð’Ñтавити\""
msgstr[2] "Підготувати виділені файли до Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ \"Ð’Ñтавити\""
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "Підготувати виділений файл до ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ \"Ð’Ñтавити\""
msgstr[1] "Підготувати виділені файли до ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ \"Ð’Ñтавити\""
msgstr[2] "Підготувати виділені файли до ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ \"Ð’Ñтавити\""
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "ОÑтаточно видалити виділений файл"
-msgstr[1] "ОÑтаточно видалити виділені файли"
-msgstr[2] "ОÑтаточно видалити виділені файли"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "Створити копію виділеного файлу"
+msgstr[1] "Створити копію кожного виділеного файлу"
+msgstr[2] "Створити копію кожного виділеного файлу"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "Створити копію виділеного файлу"
msgstr[1] "Створити копію кожного виділеного файлу"
msgstr[2] "Створити копію кожного виділеного файлу"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "Створити Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²Ð¸Ð´Ñ–Ð»ÐµÐ½Ð¾Ð³Ð¾ файлу"
msgstr[1] "Створити Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ виділеного файлу"
msgstr[2] "Створити Ñимвольне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ð³Ð¾ виділеного файлу"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "Перейменувати вибраний файл"
+msgstr[1] "Перейменувати вибраний файл"
+msgstr[2] "Перейменувати вибраний файл"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "Перейменувати вибраний файл"
+msgstr[1] "Перейменувати вибраний файл"
+msgstr[2] "Перейменувати вибраний файл"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "Створити"
@@ -2212,20 +2263,30 @@ msgstr "Ðе вÑтановлено жодного шаблону"
msgid "_Empty File"
msgstr "_Порожній файл"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "ЗавантаженнÑ..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "Ð’ÑÑ‚_авити у теку"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "Ð’_лаÑтивоÑÑ‚Ñ–..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "Відкрити _нове вікно"
@@ -2648,23 +2709,23 @@ msgid "Shutter Speed:"
msgstr "ШвидкіÑÑ‚ÑŒ затвору:"
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "Програмне забезпеченнÑ:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "ЗображеннÑ"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "Тип зображеннÑ:"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "Розмір:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2845,39 +2906,39 @@ msgstr "Ðеправильний регулÑрний вираз у позиці
msgid "Search & Replace"
msgstr "Пошук та заміна"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2887,30 +2948,30 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "Ðе вдаєтьÑÑ Ñтворити каталог \"%s\""
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "Ðе вдаєтьÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
@@ -2919,7 +2980,7 @@ msgstr[1] "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %d файли"
msgstr[2] "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %d файлів"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %d файл"
@@ -2928,6 +2989,33 @@ msgstr "Ðе вдаєтьÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ %d файл"
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "Ðе вдаєтьÑÑ Ð·'єднатиÑÑ Ð·Ñ– Ñлужбою HAL: %s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "ОÑобливі дії"
@@ -3166,11 +3254,11 @@ msgstr "Обробник елемента викликаний у коренев
msgid "Unknown closing element <%s>"
msgstr "Ðевідомий закриваючий елемент <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ адреÑу Ð´Ð»Ñ uca.xml"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "Команда не налаштована"
@@ -3221,3 +3309,88 @@ msgstr "Вибрати теку викориÑтовуючи Thunar"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "Відкрити вибрані теки в нових вікнах"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "ОÑтаточно видалити виділений файл"
+#~ msgstr[1] "ОÑтаточно видалити виділені файли"
+#~ msgstr[2] "ОÑтаточно видалити виділені файли"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права доÑтупу до \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "ПропуÑтити?"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "Ðе вдаєтьÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ інформацію про файл \"%s\": %s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "Файл \"%s\" вже Ñ–Ñнує. замінити його порожнім файлом?"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Ðе вдаєтьÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ \"%s\".\n"
+#~ "\n"
+#~ "ПропуÑтити?"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "Ðе вдаєтьÑÑ Ñтворити порожній файл \"%s\".\n"
+#~ "\n"
+#~ "ПропуÑтити?"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "Ðе вдаєтьÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ команду stat Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñƒ \"%s\": %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "ПерезапиÑати?"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "Ðе вдаєтьÑÑ Ñтворити каталог \"%s\": %s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ‚ÐµÐº..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "Ðе вдаєтьÑÑ Ñтворити теку \"%s\": %s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "Ðе можна переміщувати кореневий каталог"
+
+#, fuzzy
+#~ msgid "Named pipes are not supported"
+#~ msgstr "ЗапуÑкати Ñк Ñлужбу (не підтримуєтьÑÑ)"
+
+#~ msgid "Operation canceled"
+#~ msgstr "Операцію ÑкаÑовано"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "Ðеможливо прочитати ціль поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права \"%s\""
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "Ðе вдаєтьÑÑ Ñкопіювати Ñпеціальний файл \"%s\""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d9f2dadb17e82d912d5ff066db24f30e5ec26062..4dc050db5e7b27874534c09bb39710672a375cb2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-05-03 15:08+0000\n"
"Last-Translator: Li Linxiao <linxiao.li@gmail.com>\n"
"Language-Team: Chinese (Simplified) <postmaster@inlsd.org>\n"
@@ -16,371 +16,329 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "æœé›†æ–‡ä»¶ä¸..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"您想è¦è·³è¿‡å—？"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "æ— æ³•ç¡®å®š \"%s\" 的文件信æ¯ï¼š%s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "æ— æ³•æ›´æ”¹ \"%s\" çš„æƒé™è®¾å®šï¼š %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "æ— æ³•æ›´æ”¹æ–‡ä»¶ \"%s\" 的拥有者： %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "æ— æ³•æ›´æ”¹æ–‡ä»¶ \"%s\" 的群组：%s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "文件 \"%s\" å·²ç»å˜åœ¨ã€‚您想è¦ç”¨ä¸€ä¸ªç©ºæ–‡ä»¶å–代它å—？"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"æ— æ³•ç§»é™¤ \"%s\".\n"
-"\n"
-"您想è¦è·³è¿‡å—？"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"æ— æ³•å»ºç«‹ç©ºæ–‡ä»¶ \"%s\".\n"
-"\n"
-"您想è¦è·³è¿‡å—？"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "æ— æ³•è¯»å–文件夹内容"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "未知的错误"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Exec æ 并未指定"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "URL æ 并未指定"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "æ— æ•ˆçš„æ¡Œé¢æ–‡ä»¶"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "æ— æ³•è§£æžæ–‡ä»¶"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "æ— æ•ˆçš„æ–‡ä»¶å"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "æ— æ³• stat 文件 \"%s\"：%s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"您想è¦è¦†ç›–它å—？"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "æ— æ³•ç§»é™¤ \"%s\"：%s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "æ— æ³•ç”±æ–‡ä»¶ %s 载入应用程åº"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "指令"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "执行 mime 处ç†ç¨‹åºçš„指令"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "æ ‡å¿—"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "mime 处ç†ç¨‹åºçš„æ ‡å¿—"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "å›¾æ ‡"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "é‡å‘½åæ“作失败\"%s\""
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "mime 处ç†ç¨‹åºçš„å›¾æ ‡"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "准备ä¸..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "å称"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "æ— æ³•æ›´æ”¹ \"%s\" çš„æƒé™è®¾å®šï¼š %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "mime 处ç†ç¨‹åºçš„å称"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "æ— æ³•æ›´æ”¹æ–‡ä»¶ \"%s\" 的拥有者： %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "%s 文档"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "æ— æ³•æ›´æ”¹æ–‡ä»¶ \"%s\" 的群组：%s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "æ— æ³•åˆ›å»ºç›®å½• \"%s\"：%s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "è·¯å¾„å¤ªé•¿ï¼Œæ— æ³•æ”¾å…¥ç¼“å†²åŒº"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI å¤ªé•¿ï¼Œæ— æ³•æ”¾å…¥ç¼“å†²åŒº"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "大å°"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "期望的 thumbnail 大å°"
+msgid "The file \"%s\" already exists"
+msgstr "文件 \"%s\" å·²å˜åœ¨"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "åˆ é™¤ç›®å½•ä¸..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "æ— æ³•åˆ›å»ºå‘½å fifo \"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "æ— æ³•ç§»é™¤ç›®å½• \"%s\"：%s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "æ— æ³•è½¬ç§»æ ¹ç›®å½•"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "准备ä¸..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "æ— æ³•æ‰“å¼€ \"%s\" 以读å–"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "æ— æ•ˆçš„è·¯å¾„"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "æ— æ³•æ‰“å¼€ \"%s\" 以写入"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "未知的用户 \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "æ— æ³•å°†æ•°æ®å†™å…¥ \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "æ— æ³•ç¡®å®š %s 的挂载点"
+msgid "Failed to remove \"%s\""
+msgstr "æ— æ³•ç§»é™¤ \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "æ— æ³•è¿žæŽ¥è‡³ HAL 守护进程： \"%s\""
+msgid "Failed to read data from \"%s\""
+msgstr "æ— æ³•ä»Ž \"%s\" 读å–æ•°æ®"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "%s çš„æ‹·è´"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "%s 的连接"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "%s çš„å¦ä¸€ä»½æ‹·è´"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "%s çš„å¦ä¸€ä¸ªè¿žæŽ¥"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "%s 的第三份拷è´"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "%s 的第三个连接"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%2$s的第%1$u份拷è´"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%2$s的第%1$u个连接"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "æ— æ³•ç¡®å®š \"%s\" 的文件信æ¯"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "æ— æ³•åˆ›å»ºç›®å½• \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "æ— æ³•åˆ›å»ºå‘½å fifo \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "ä¸æ”¯æŒå‘½å管é“"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "æ— æ³•æ‰“å¼€ \"%s\" 以读å–"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "æ— æ³•åˆ›å»ºç¬¦å·è¿žæŽ¥ \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "文件 \"%s\" å·²å˜åœ¨"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "æ— æ³•æ‰“å¼€ \"%s\" 以写入"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "ä¸æ”¯æŒç¬¦å·è¿žæŽ¥"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "æ— æ³•ä»Ž \"%s\" 读å–æ•°æ®"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "文件系统"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "æ— æ³•æ‰“å¼€ \"%s\": %s"
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "æ— æ³•æ‰“å¼€ \"%s\": %s"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "æ— æ³•ç§»é™¤ \"%s\"：%s"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "路径 \"%s\" ä¸æ˜¯ç›®å½•"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "æ— æ³•å°†æ•°æ®å†™å…¥ \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "æ— æ³•ç”±æ–‡ä»¶ %s 载入应用程åº"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "æ— æ³•ç§»é™¤ \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "æ— æ³•ç§»é™¤ \"%s\"：%s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "撤销上次æ“作"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "指令"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "æ— æ³•ä»Ž \"%s\" 读å–è¿žæŽ¥ç›®æ ‡"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "执行 mime 处ç†ç¨‹åºçš„指令"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "æ ‡å¿—"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "mime 处ç†ç¨‹åºçš„æ ‡å¿—"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "å›¾æ ‡"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "mime 处ç†ç¨‹åºçš„å›¾æ ‡"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "å称"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "mime 处ç†ç¨‹åºçš„å称"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "æ— æ³•åˆ›å»ºç¬¦å·è¿žæŽ¥ \"%s\""
+msgid "%s document"
+msgstr "%s 文档"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "æ— æ³•æ›´æ”¹ \"%s\" 的模å¼"
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "ä¸æ”¯æŒç¬¦å·è¿žæŽ¥"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "è·¯å¾„å¤ªé•¿ï¼Œæ— æ³•æ”¾å…¥ç¼“å†²åŒº"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI å¤ªé•¿ï¼Œæ— æ³•æ”¾å…¥ç¼“å†²åŒº"
+
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "大å°"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "期望的 thumbnail 大å°"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "æœé›†æ–‡ä»¶ä¸..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "æ— æ•ˆçš„è·¯å¾„"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "æ— æ³•ç¡®å®š \"%s\" 的文件信æ¯"
+msgid "Unknown user \"%s\""
+msgstr "未知的用户 \"%s\""
+
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "æ— æ³•ç¡®å®š %s 的挂载点"
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "æ— æ³•å¤åˆ¶ç‰¹æ®Šæ–‡ä»¶ \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "æ— æ³•è¿žæŽ¥è‡³ HAL 守护进程： \"%s\""
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -501,138 +459,219 @@ msgid "Sort items in descending order"
msgstr "按照下é™çš„顺åºæŽ’列"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "æ“ä½œæ— æ³•å¯åŠ¨"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "æ— æ³•æ‰“å¼€ \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "æ— æ³•æ‰“å¼€ \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "å¤åˆ¶æ–‡ä»¶ä¸..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "建立符å·è¿žç»“ä¸..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "移动文件ä¸..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "移动文件ä¸..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr "ä½ ç¡®å®šçœŸçš„è¦å½»åº•åˆ 除文件\"%s\"å—?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] "ä½ ç¡®å®šçœŸçš„è¦å½»åº•åˆ 除选ä¸çš„文件å—?"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "å¦‚æžœä½ åˆ é™¤æ–‡ä»¶,它ä¸ä¼šå†è¢«æ¢å¤."
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "åˆ é™¤æ–‡ä»¶ä¸..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "建立文件ä¸..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "建立目录ä¸..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "空文件(_E)"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "æ— æ³•ç¡®å®š %s 的挂载点"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "新建文件夹"
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "新建文件夹"
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "æ— æ³•ç§»é™¤ \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "åˆ é™¤æ–‡ä»¶ä¸..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "æ— æ³•ä¸º \"%s\" 设定预设应用程åº"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "未选择任何应用程åº"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
msgstr "选择的应用程åºç”¨æ¥æ‰“开本文件和其他 \"%s\" å½¢å¼çš„文件"
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "其他应用程åº(_O)"
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "以...打开"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "使用自订的指令："
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
msgstr "使用一自订的指令æ¥æ‰§è¡Œä¸Šé¢åº”用程åºæ¸…å•ä¸æ‰€æ²¡æœ‰çš„应用程åºã€‚"
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "æµè§ˆ(_B)..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "设为æ¤ç±»æ–‡ä»¶çš„预设模å¼(_D)"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "æ— æ³•æ–°å¢žæ–°çš„åº”ç”¨ç¨‹åº\"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "æ— æ³•æ‰§è¡Œ\"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
#, fuzzy
msgid "_Remove Launcher"
msgstr "åˆ é™¤å¿«æ·æ–¹å¼"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "打开 <i>%s</i> 和其他 \"%s\" 类型的文件，使用："
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
msgstr "æµè§ˆæ–‡ä»¶ç³»ç»Ÿä»¥é€‰æ‹©ä¸€åº”用程åºæ¥æ‰“å¼€ \"%s\" 类型的文件"
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr "将打开 \"%s\" 类型文件的预设应用程åºæ”¹è®¾ä¸ºæ‰€é€‰æ‹©ç¨‹åºã€‚"
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, fuzzy, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "ä½ ç¡®å®šçœŸçš„è¦å½»åº•åˆ 除文件\"%s\"å—?"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -641,39 +680,39 @@ msgid ""
"command box in the \"Open With\" dialog of the file manager."
msgstr ""
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "选择一个应用程åº"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "所有文件"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "å¯æ‰§è¡Œæ–‡ä»¶"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perl 脚本"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Python 脚本"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Ruby 脚本"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shell 脚本"
@@ -693,7 +732,7 @@ msgid "Other Applications"
msgstr "其他应用程åº"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "剪贴簿ä¸æ²¡æœ‰ä¸œè¥¿å¯ä»¥è´´ä¸Š"
@@ -758,14 +797,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "按需求自动延展æ ä½(_E)"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "未知的"
@@ -778,7 +818,7 @@ msgstr "å›¾æ ‡æ–¹å¼ç›®å½•åˆ—表"
msgid "Compact view"
msgstr ""
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "输入新å称："
@@ -804,16 +844,32 @@ msgstr "详细目录列表"
msgid "Details view"
msgstr "详细查看"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "翻译"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "æ— æ³•æ‰“å¼€æ–‡ä»¶æµè§ˆå™¨"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "是"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "全部是"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "å¦"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "å–消"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "å¤åˆ¶åˆ°è¿™é‡Œ(_C)"
@@ -868,7 +924,7 @@ msgstr "拥有者"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "æƒé™"
@@ -884,14 +940,10 @@ msgstr "文件"
msgid "File Name"
msgstr "文件å称"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "æ²¡æœ‰æ¯”æ ¹ç›®å½•æ›´ä¸Šå±‚çš„ç›®å½•"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "文件系统"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -925,14 +977,14 @@ msgstr "å›¾æ ‡æŸ¥çœ‹"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "打开(_O)"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "在新窗å£ä¸æ‰“å¼€"
@@ -1058,120 +1110,139 @@ msgid "Send the selected file to \"%s\""
msgid_plural "Send the selected files to \"%s\""
msgstr[0] "打开选择的文件"
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "连结失效"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
msgstr[0] ""
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d 个项目，å¯ç”¨ç©ºé—´ %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d 个项目"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr "\"%s\" 连结失效"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) 连结至 %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+#, fuzzy
+msgid "Image Size:"
+msgstr "图åƒæ–‡ä»¶"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "已选择 %d 个项目(%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "已选择 %d 个项目"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "é—´éš”"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "路径按钮间间隔的大å°"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "在本窗å£ä¸æ‰“å¼€ \"%s\""
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "在新窗å£ä¸æ‰“å¼€ \"%s\""
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr ""
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "新建文件夹"
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
msgstr "通过先å‰çš„剪切或å¤åˆ¶å‘½ä»¤æŠŠæ–‡ä»¶ç§»åŠ¨æˆ–å¤åˆ¶åˆ°\"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "粘贴到文件夹"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr ""
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
#, fuzzy
msgid "_Properties"
msgstr "属性(_P)"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "新文件夹"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "新建文件夹"
@@ -1188,11 +1259,11 @@ msgstr "ä½å€(_L)"
msgid "Failed to launch \"%s\""
msgstr "æ— æ³•å¯åŠ¨ \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "å›¾æ ‡å¤§å°"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "è·¯å¾„é€‰é¡¹çš„å›¾æ ‡å¤§å°"
@@ -1270,17 +1341,15 @@ msgid "Stop applying permissions recursively."
msgstr "åœæ¢é€’归应用æƒé™"
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "问题"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "递归应用�"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
#, fuzzy
msgid ""
"Do you want to apply your changes recursively to\n"
@@ -1289,11 +1358,11 @@ msgstr ""
"您想递归的应用于所选文件夹 \n"
"内的所有文件与å文件夹å—？"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "下次ä¸å†è¯¢é—®"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1302,29 +1371,29 @@ msgstr ""
"选择该选项åŽä¼šè®°ä½æ‚¨çš„选择ä¸å†è¯¢é—®ã€‚以åŽæ‚¨å¯ä»¥ä½¿ç”¨é¦–选项对è¯æ¡†æ”¹å˜æ‚¨çš„选择。"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "改å˜ç»„æ“作失败"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "应用新æƒé™å¤±è´¥"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "未知文件的所有者"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "自动修æ£æ–‡ä»¶å¤¹æƒé™ï¼Ÿ"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "ä¿®æ£æ–‡ä»¶å¤¹æƒé™"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1332,86 +1401,66 @@ msgid ""
msgstr ""
"文件夹æƒé™å°†è¢«è®¾ç½®ä¸ºä¸€è‡´çš„状æ€ã€‚åªæœ‰æœ‰è¯»æƒé™çš„用户将被å…许进入æ¤æ–‡ä»¶å¤¹ã€‚"
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "是"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "全部是"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "å¦"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "å–消"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "文件管ç†å™¨é¦–选项"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "视图"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "默认视图"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "查看新文件夹使用(_N)："
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "å›¾æ ‡è§†å›¾"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "列表视图"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
#, fuzzy
msgid "Compact List View"
msgstr "列表视图"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "上一次视图"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "排列文件夹在文件之å‰"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr "选择æ¤é€‰é¡¹æ–‡ä»¶å¤¹å°†æŽ’列在文件之å‰ã€‚"
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "显示缩略图(_S)"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
msgstr "选择æ¤é€‰é¡¹æ–‡ä»¶å¤¹å†…å¯é¢„è§ˆçš„æ–‡ä»¶å°†è‡ªåŠ¨æ˜¾ç¤ºä¸ºç¼©ç•¥å›¾æ ‡ã€‚"
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "æ–‡å—ä¸Žå›¾æ ‡(_T)"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1420,76 +1469,76 @@ msgstr "选择æ¤é€‰é¡¹å›¾æ ‡æ ‡é¢˜å°†æ˜¾ç¤ºåœ¨å›¾æ ‡æ—。"
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "侧æ "
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "å¿«æ·æ "
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "å›¾æ ‡å¤§å°(_I):"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "很å°"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "较å°"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "å°"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "普通"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "大"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "较大"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "巨大"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "æ˜¾ç¤ºå›¾æ ‡(_E)"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
msgstr "选择æ¤é€‰é¡¹åœ¨å¿«æ·æ æ˜¾ç¤ºæ‰€æœ‰å·²å®šä¹‰æ–‡ä»¶å¤¹å±žæ€§çš„å›¾æ ‡ã€‚"
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "æ ‘çŠ¶ç›®å½•"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "å›¾æ ‡å¤§å°(_S):"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "æ˜¾ç¤ºå›¾æ ‡(_M)"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1498,22 +1547,25 @@ msgstr "选选择æ¤é€‰é¡¹åœ¨æ ‘状æ 显示所有已定义文件夹属性的图
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "行为"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "å•å‡»æ¿€æ´»é¡¹ç›®(_S)"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1522,34 +1574,34 @@ msgid ""
"to select the item without activating it."
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr ""
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "åŒå‡»æ¿€æ´»é¡¹ç›®(_D)"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "高级"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "文件夹æƒé™"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1558,175 +1610,180 @@ msgstr ""
"改å˜æ–‡ä»¶å¤¹æƒé™æ—¶ï¼Œå¯åº”用改å˜äºŽ\n"
"文件夹ä¸çš„内容。选择默认行为："
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "æ¯æ¬¡"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "仅应用于文件夹"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "应用于文件夹与内容"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(%lu å°æ—¶å‰©ä½™)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(%lu 分钟剩余)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(%lu 秒剩余)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "大概"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "å称:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "类型:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "打开方å¼:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "é“¾æŽ¥ç›®æ ‡"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "åˆ é™¤(_D)"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "修改:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "访问："
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "大å°:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "容é‡:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "å¯ç”¨ç©ºé—´:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "å¾½æ ‡"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr ""
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "é‡å‘½åæ“作失败\"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "文件(_F)"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "文件内容èœå•"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
#, fuzzy
msgid "_Add Files..."
msgstr "声音文件(_A)"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "关于(_A)"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
#, fuzzy
msgid "Display information about Thunar Bulk Rename"
msgstr "显示Thunarçš„ä¿¡æ¯"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "属性(_P)"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "查看文件属性"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
#, fuzzy
msgid "Rename Multiple Files"
msgstr "é‡å‘½å选å–的文件"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
#, fuzzy
msgid "_Rename Files"
msgstr "图åƒæ–‡ä»¶(_I);"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
#, fuzzy
msgid "New Name"
msgstr "文件å称"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
#, fuzzy
msgid "Click here to view the documentation for the selected rename operation."
msgstr "点击æ¤å¤„自动修æ£æ–‡ä»¶"
@@ -1734,7 +1791,7 @@ msgstr "点击æ¤å¤„自动修æ£æ–‡ä»¶"
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1742,52 +1799,52 @@ msgid ""
msgstr ""
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
#, fuzzy
msgid "Select files to rename"
msgstr "é‡å‘½åæ“作失败\"%s\""
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
#, fuzzy
msgid "Audio Files"
msgstr "声音文件(_A)"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "图åƒæ–‡ä»¶"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
#, fuzzy
msgid "Video Files"
msgstr "视频文件(_V)"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
#, fuzzy
msgid "Bulk Rename"
msgstr "é‡å‘½å"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
msgstr ""
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
#, fuzzy
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "图åƒæ–‡ä»¶"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] ""
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr ""
@@ -1829,263 +1886,255 @@ msgid_plural "Add the selected folders to the shortcuts side pane"
msgstr[0] "åŠ å…¥å·²é€‰æ–‡ä»¶å¤¹åˆ°å¿«æ·æ "
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "挂载å·(_M)"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "弹出å·(_E)"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "å¸è½½å·(_U)"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "åˆ é™¤å¿«æ·æ–¹å¼"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "é‡å‘½åå¿«æ·æ–¹å¼"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "路径 \"%s\" ä¸æ˜¯ç›®å½•"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "创建快æ·æ–¹å¼å¤±è´¥"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "弹出 \"%s\" 失败"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "挂载\"%s\"失败"
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "å¸è½½\"%s\"失败"
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
#, fuzzy
msgid "Click here to stop calculating the total size of the folder."
msgstr "点击æ¤å¤„自动修æ£æ–‡ä»¶"
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr ""
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
#, fuzzy
msgid "Calculating..."
msgstr "æœé›†æ–‡ä»¶ä¸..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr ""
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] ""
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "目录内容èœå•"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "在当å‰ç›®å½•åˆ›å»ºä¸€ä¸ªç©ºæ–‡ä»¶å¤¹"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "剪切"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "å¤åˆ¶(_C)"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "å¤åˆ¶(_P)"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr "使用剪切或å¤åˆ¶å‘½ä»¤ç§»åŠ¨æˆ–å¤åˆ¶æ‰€é€‰æ–‡ä»¶"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "åˆ é™¤(_D)"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
msgstr "使用剪切或å¤åˆ¶å‘½ä»¤ç§»åŠ¨æˆ–å¤åˆ¶æ‰€é€‰æ–‡ä»¶åˆ°å·²é€‰æ–‡ä»¶å¤¹"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "全选(_A)"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "全选当å‰çª—å£çš„文件"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "æ ¹æ®ç±»åž‹é€‰æ‹©"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "选择所有符åˆç±»åž‹çš„文件"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "å¤åˆ¶(_U)"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "建立连接(_K)"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "é‡å‘½å(_R)"
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "é‡å‘½å选å–的文件"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "创建文件"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "载入文件内容..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "新的空文件"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "新的空文件..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "从模æ¿\"%s\"ä¸åˆ›å»ºæ–‡ä»¶"
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr "ä½ ç¡®å®šçœŸçš„è¦å½»åº•åˆ 除文件\"%s\"å—?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] "ä½ ç¡®å®šçœŸçš„è¦å½»åº•åˆ 除选ä¸çš„文件å—?"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "å¦‚æžœä½ åˆ é™¤æ–‡ä»¶,它ä¸ä¼šå†è¢«æ¢å¤."
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "æ ¹æ®ç±»åž‹é€‰æ‹©"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
#, fuzzy
msgid "_Select"
msgstr "åˆ é™¤(_D)"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
#, fuzzy
msgid "_Pattern:"
msgstr "类型:"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "é‡å‘½å\"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr ""
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, fuzzy, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "创建å称fifo \"%s\" æ“作失败"
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "打开目录\"%s\"失败"
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "为将被移动的文件设置粘贴命令"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "选择将被å¤åˆ¶çš„文件"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "æ°¸ä¹…åˆ é™¤æ‰€é€‰æ‹©çš„æ–‡ä»¶"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "å¤åˆ¶æ‰€é€‰æ‹©çš„文件"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "å¤åˆ¶æ‰€é€‰æ‹©çš„文件"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "为æ¯ä¸ªæ‰€é€‰æ–‡ä»¶åˆ›å»ºç¬¦å·é“¾æŽ¥"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "é‡å‘½å选å–的文件"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "é‡å‘½å选å–的文件"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "新建"
@@ -2104,20 +2153,30 @@ msgstr "ä¸åˆ›å»ºæ¨¡æ¿"
msgid "_Empty File"
msgstr "空文件(_E)"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "准备ä¸..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "把文件粘贴到æ¤å¤„(_P)"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "准备ä¸..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "在新窗å£ä¸æ‰“å¼€"
@@ -2540,26 +2599,25 @@ msgid "Shutter Speed:"
msgstr ""
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr ""
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
#, fuzzy
msgid "Image"
msgstr "图åƒæ–‡ä»¶"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
#, fuzzy
msgid "Image Type:"
msgstr "图åƒæ–‡ä»¶"
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-#, fuzzy
-msgid "Image Size:"
-msgstr "图åƒæ–‡ä»¶"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2732,39 +2790,39 @@ msgstr ""
msgid "Search & Replace"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
"highly recommended to compress large files before sending them."
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2774,37 +2832,37 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
#, fuzzy
msgid "Compressing files..."
msgstr "å¤åˆ¶æ–‡ä»¶ä¸..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr ""
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
#, fuzzy
msgid "Failed to create temporary directory"
msgstr "æ— æ³•åˆ›å»ºç›®å½• \"%s\""
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, fuzzy, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "æ— æ³•åˆ›å»ºç¬¦å·è¿žæŽ¥ \"%s\""
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, fuzzy, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
msgstr[0] "æ— æ³•æ‰“å¼€ %d 个文件"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
#, fuzzy
msgid "Failed to compose new email"
msgstr "æ— æ³•æ‰“å¼€ %d 个文件"
@@ -2813,6 +2871,33 @@ msgstr "æ— æ³•æ‰“å¼€ %d 个文件"
msgid "Mail Recipient"
msgstr ""
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "æ— æ³•è¿žæŽ¥è‡³ HAL 守护进程： \"%s\""
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "自定义动作"
@@ -3032,11 +3117,11 @@ msgstr "æ ¹ä¸Šä¸‹æ–‡è°ƒç”¨æœ€åŽçš„å…ƒç´ å¤„ç†"
msgid "Unknown closing element <%s>"
msgstr "未知关é—å…ƒç´ <%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "ä¸èƒ½ä¿å˜uca.xml到该目录"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "没有设置命令"
@@ -3086,3 +3171,85 @@ msgstr "打开文件夹"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "在新的 Thunar 窗å£ä¸æ‰“开选择的目录"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "æ°¸ä¹…åˆ é™¤æ‰€é€‰æ‹©çš„æ–‡ä»¶"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "æ— æ³•æ›´æ”¹ \"%s\" çš„æƒé™è®¾å®šï¼š %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "您想è¦è·³è¿‡å—？"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "æ— æ³•ç¡®å®š \"%s\" 的文件信æ¯ï¼š%s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "文件 \"%s\" å·²ç»å˜åœ¨ã€‚您想è¦ç”¨ä¸€ä¸ªç©ºæ–‡ä»¶å–代它å—？"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "æ— æ³•ç§»é™¤ \"%s\".\n"
+#~ "\n"
+#~ "您想è¦è·³è¿‡å—？"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "æ— æ³•å»ºç«‹ç©ºæ–‡ä»¶ \"%s\".\n"
+#~ "\n"
+#~ "您想è¦è·³è¿‡å—？"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "æ— æ³• stat 文件 \"%s\"：%s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "您想è¦è¦†ç›–它å—？"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "æ— æ³•åˆ›å»ºç›®å½• \"%s\"：%s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "åˆ é™¤ç›®å½•ä¸..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "æ— æ³•ç§»é™¤ç›®å½• \"%s\"：%s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "æ— æ³•è½¬ç§»æ ¹ç›®å½•"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "ä¸æ”¯æŒå‘½å管é“"
+
+#~ msgid "Operation canceled"
+#~ msgstr "撤销上次æ“作"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "æ— æ³•ä»Ž \"%s\" 读å–è¿žæŽ¥ç›®æ ‡"
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "æ— æ³•æ›´æ”¹ \"%s\" 的模å¼"
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "æ— æ³•å¤åˆ¶ç‰¹æ®Šæ–‡ä»¶ \"%s\""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b1eb165a6908d1b1b628dc7e959707f8ca0057ad..c42f0e009301522ed730c748527f83b2835196ab 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar 0.3.2beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-15 20:42+0900\n"
+"POT-Creation-Date: 2006-07-27 17:59+0200\n"
"PO-Revision-Date: 2006-06-12 21:15+0800\n"
"Last-Translator: Hydonsingore Cia <hydonsingore@educities.edu.tw>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -17,371 +17,329 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:160
-#: ../thunar-vfs/thunar-vfs-chown-job.c:158
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:262
-msgid "Collecting files..."
-msgstr "è’集檔案ä¸..."
-
-#. ask the user whether we should skip the file
-#. ask the user whether to skip this file (used for cancellation only)
-#. ask the user whether to skip
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:181
-#: ../thunar-vfs/thunar-vfs-chown-job.c:179
-#: ../thunar-vfs/thunar-vfs-link-job.c:205
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:776
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"%s.\n"
-"\n"
-"您想è¦ç•¥éŽå—Žï¼Ÿ"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:245
-#: ../thunar-vfs/thunar-vfs-chown-job.c:243
-#, c-format
-msgid "Failed to determine file info of \"%s\": %s"
-msgstr "無法決定 \"%s\" 的檔案資訊：%s"
-
-#: ../thunar-vfs/thunar-vfs-chmod-job.c:271
-#, c-format
-msgid "Failed to change permissions of \"%s\": %s"
-msgstr "無法更改 \"%s\" 的權é™è¨å®šï¼š %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:259
-#, c-format
-msgid "Failed to change file owner of \"%s\": %s"
-msgstr "無法更改檔案 \"%s\" çš„æ“有者： %s"
-
-#: ../thunar-vfs/thunar-vfs-chown-job.c:261
-#, c-format
-msgid "Failed to change file group of \"%s\": %s"
-msgstr "無法更改檔案 \"%s\" 的群組：%s"
-
-#. ask the user whether to override this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:180
-#, c-format
-msgid ""
-"The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr "檔案 \"%s\" 已經å˜åœ¨ã€‚您想è¦ç”¨ä¸€å€‹ç©ºæª”案å–而代之嗎？"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:191
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:227
-#, c-format
-msgid ""
-"Failed to remove \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"無法移除 \"%s\".\n"
-"\n"
-"您想è¦è·³éŽå—Žï¼Ÿ"
-
-#. ask the user whether to skip this path
-#: ../thunar-vfs/thunar-vfs-creat-job.c:208
-#, c-format
-msgid ""
-"Failed to create empty file \"%s\".\n"
-"\n"
-"Do you want to skip it?"
-msgstr ""
-"無法建立空檔案 \"%s\".\n"
-"\n"
-"您想è¦è·³éŽå—Žï¼Ÿ"
-
#. base directory not readable
-#: ../thunar-vfs/thunar-vfs-deep-count-job.c:213
+#: ../thunar-vfs/thunar-vfs-deep-count-job.c:236
msgid "Failed to read folder contents"
msgstr "無法讀å–資料夾內容"
-#: ../thunar-vfs/thunar-vfs-exec.c:509
+#: ../thunar-vfs/thunar-vfs-exec.c:512
msgid "Unknown error"
msgstr "未知的錯誤"
#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:379
+#: ../thunar-vfs/thunar-vfs-info.c:338
msgid "No Exec field specified"
msgstr "Exec 欄並未指定"
#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is.
-#: ../thunar-vfs/thunar-vfs-info.c:398
+#: ../thunar-vfs/thunar-vfs-info.c:357
msgid "No URL field specified"
msgstr "URL 欄並未指定"
-#: ../thunar-vfs/thunar-vfs-info.c:403 ../thunar-vfs/thunar-vfs-info.c:526
+#: ../thunar-vfs/thunar-vfs-info.c:362 ../thunar-vfs/thunar-vfs-io-local.c:868
msgid "Invalid desktop file"
msgstr "無效的桌é¢æª”案"
-#: ../thunar-vfs/thunar-vfs-info.c:411
+#: ../thunar-vfs/thunar-vfs-info.c:370
msgid "Failed to parse file"
msgstr "無法處ç†æª”案"
-#: ../thunar-vfs/thunar-vfs-info.c:504
+#: ../thunar-vfs/thunar-vfs-info.c:451
msgid "Invalid file name"
msgstr "無效的檔å"
-#. TRANSLATORS: See man page of stat(1) or stat(2) for more details.
-#: ../thunar-vfs/thunar-vfs-info.c:761
-#, c-format
-msgid "Failed to stat file \"%s\": %s"
-msgstr "無法安置檔案 \"%s\"：%s"
-
-#. ask the user whether we should remove the target first
-#. ask the user whether to overwrite
-#: ../thunar-vfs/thunar-vfs-link-job.c:169
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:756
-#, c-format
-msgid ""
-"%s.\n"
-"\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s.\n"
-"\n"
-"您想è¦è¦†è“‹å®ƒå—Žï¼Ÿ"
-
-#. tell the user that we failed to delete the application launcher
-#: ../thunar-vfs/thunar-vfs-link-job.c:193
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1771
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:656
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:709
-#, c-format
-msgid "Failed to remove \"%s\": %s"
-msgstr "無法移除 \"%s\"：%s"
-
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1705
-#, c-format
-msgid "Failed to load application from file %s"
-msgstr "無法由檔案 %s 載入應用程å¼"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:127
-msgid "Command"
-msgstr "指令"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:128
-msgid "The command to run the mime handler"
-msgstr "執行 mime 處置元的指令"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:140
-msgid "Flags"
-msgstr "旗標"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:141
-msgid "The flags for the mime handler"
-msgstr "mime 處置元的旗標"
-
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:156
-msgid "Icon"
-msgstr "圖示"
+#: ../thunar-vfs/thunar-vfs-info.c:458
+#, fuzzy
+msgid "Only local files may be renamed"
+msgstr "é¸æ“‡è¦é‡æ–°å‘½å的檔案"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:157
-msgid "The icon of the mime handler"
-msgstr "mime 處置元的圖示"
+#. tell the user that we're preparing to unlink the files
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:81
+msgid "Preparing..."
+msgstr "準備ä¸..."
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:169
-#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:432
-#: ../thunarx/thunarx-renamer.c:177
-msgid "Name"
-msgstr "å稱"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:226
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:517
+#, fuzzy, c-format
+msgid "Failed to change permissions of \"%s\""
+msgstr "無法更改 \"%s\" 的權é™è¨å®šï¼š %s"
-#: ../thunar-vfs/thunar-vfs-mime-handler.c:170
-msgid "The name of the mime handler"
-msgstr "mime 處置元的å稱"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:347
+#, fuzzy, c-format
+msgid "Failed to change file owenr of \"%s\""
+msgstr "無法更改檔案 \"%s\" çš„æ“有者： %s"
-#: ../thunar-vfs/thunar-vfs-mime-info.c:228
-#, c-format
-msgid "%s document"
-msgstr "%s 文件"
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:348
+#, fuzzy, c-format
+msgid "Failed to change file group of \"%s\""
+msgstr "無法更改檔案 \"%s\" 的群組：%s"
-#: ../thunar-vfs/thunar-vfs-mkdir-job.c:157
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:432
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:182
#, c-format
-msgid "Failed to create directory \"%s\": %s"
-msgstr "無法建立目錄 \"%s\"：%s"
-
-#: ../thunar-vfs/thunar-vfs-path.c:684
-msgid "Path too long to fit into buffer"
-msgstr "路徑太長，無法放入緩è¡å€"
-
-#: ../thunar-vfs/thunar-vfs-path.c:787
-msgid "URI too long to fit into buffer"
-msgstr "URI 太長，無法放入緩è¡å€"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
-msgid "Size"
-msgstr "大å°"
-
-#: ../thunar-vfs/thunar-vfs-thumb.c:173
-msgid "The desired thumbnail size"
-msgstr "指定縮圖大å°"
+msgid "The file \"%s\" already exists"
+msgstr "檔案·\"%s\"·已å˜åœ¨"
-#. display info message
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:358
-msgid "Deleting directories..."
-msgstr "刪除目錄ä¸..."
+#: ../thunar-vfs/thunar-vfs-io-jobs.c:450
+#, fuzzy, c-format
+msgid "Failed to create empty file \"%s\""
+msgstr "無法建立å稱·fifo·\"%s\""
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:378
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:157
#, c-format
-msgid "Failed to remove directory \"%s\": %s"
-msgstr "無法移除目錄 \"%s\"：%s"
-
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:902
-msgid "Cannot transfer the root directory"
-msgstr "ç„¡æ³•è½‰ç§»æ ¹ç›®éŒ„"
-
-#. tell the user that we're preparing the unlink job
-#: ../thunar-vfs/thunar-vfs-unlink-job.c:154
-msgid "Preparing..."
-msgstr "準備ä¸..."
+msgid "Failed to open \"%s\" for reading"
+msgstr "無法開啟 \"%s\" 來讀å–"
-#: ../thunar-vfs/thunar-vfs-util.c:251 ../thunar/thunar-path-entry.c:1262
-msgid "Invalid path"
-msgstr "無效的路徑"
+#. use the generic error message
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:188
+#: ../thunar-vfs/thunar-vfs-io-trash.c:459
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "無法開啟 \"%s\" 來寫入"
-#: ../thunar-vfs/thunar-vfs-util.c:287
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:215
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:278
#, c-format
-msgid "Unknown user \"%s\""
-msgstr "未知的使用者 \"%s\""
+msgid "Failed to write data to \"%s\""
+msgstr "無法將資料寫入 \"%s\""
-#. something went wrong, for sure
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#. display an error to the user
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:231
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:294
+#: ../thunar-vfs/thunar-vfs-io-ops.c:495 ../thunar/thunar-chooser-dialog.c:786
#, c-format
-msgid "Failed to determine the mount point for %s"
-msgstr "無法決定 %s 的掛載點"
+msgid "Failed to remove \"%s\""
+msgstr "無法移除 \"%s\""
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:261
#, c-format
-msgid "Failed to connect to the HAL daemon: %s"
-msgstr "無法連çµè‡³Â·HAL·æœå‹™:·%s"
+msgid "Failed to read data from \"%s\""
+msgstr "無法從 \"%s\" 讀å–資料"
-#: ../thunar-vfs/thunar-vfs-xfer.c:192
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:343
#, c-format
msgid "copy of %s"
msgstr "%s çš„æ‹·è²"
-#: ../thunar-vfs/thunar-vfs-xfer.c:193 ../thunar/thunar-list-model.c:776
-#: ../thunar/thunar-properties-dialog.c:726
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:344
+#: ../thunar/thunar-list-model.c:776 ../thunar/thunar-properties-dialog.c:761
#, c-format
msgid "link to %s"
msgstr "%s 的連çµ"
-#: ../thunar-vfs/thunar-vfs-xfer.c:196
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:347
#, c-format
msgid "another copy of %s"
msgstr "%s çš„å¦ä¸€ä»½æ‹·è²"
-#: ../thunar-vfs/thunar-vfs-xfer.c:197
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:348
#, c-format
msgid "another link to %s"
msgstr "%s çš„å¦ä¸€å€‹é€£çµ"
-#: ../thunar-vfs/thunar-vfs-xfer.c:200
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:351
#, c-format
msgid "third copy of %s"
msgstr "%s 的第三份拷è²"
-#: ../thunar-vfs/thunar-vfs-xfer.c:201
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:352
#, c-format
msgid "third link to %s"
msgstr "%s 的第三個連çµ"
#. if we had no match on the NAMES, try the "%uth copy of %s" pattern
-#: ../thunar-vfs/thunar-vfs-xfer.c:240 ../thunar-vfs/thunar-vfs-xfer.c:256
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:391
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:407
#, c-format
msgid "%uth copy of %s"
msgid_plural "%uth copy of %s"
msgstr[0] "%2$s的第%1$u份拷è²"
-#: ../thunar-vfs/thunar-vfs-xfer.c:258
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:409
#, c-format
msgid "%uth link to %s"
msgid_plural "%uth link to %s"
msgstr[0] "%2$s的第%1$u個連çµ"
-#. setup the error return
-#: ../thunar-vfs/thunar-vfs-xfer.c:306
+#. unable to stat source file, impossible to copy then
+#. the file does not exist, don't try to create a symlink then
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:469
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:586
+#: ../thunar-vfs/thunar-vfs-io-ops.c:144
+#, c-format
+msgid "Failed to determine file info for \"%s\""
+msgstr "無法決定 \"%s\" 的檔案資訊"
+
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:485
+#: ../thunar-vfs/thunar-vfs-io-ops.c:415
#, c-format
msgid "Failed to create directory \"%s\""
msgstr "無法建立目錄 \"%s\""
#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
-#: ../thunar-vfs/thunar-vfs-xfer.c:331
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:494
#, c-format
msgid "Failed to create named fifo \"%s\""
msgstr "無法建立å稱·fifo·\"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:340
-msgid "Named pipes are not supported"
-msgstr "尚未支æ´å稱管線"
-
-#: ../thunar-vfs/thunar-vfs-xfer.c:368
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:512
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:592
#, c-format
-msgid "Failed to open \"%s\" for reading"
-msgstr "無法開啟 \"%s\" 來讀å–"
+msgid "Failed to create symbolic link \"%s\""
+msgstr "ç„¡æ³•å»ºç«‹ç¬¦è™Ÿé€£çµ \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:393
-#, c-format
-msgid "The file \"%s\" already exists"
-msgstr "檔案·\"%s\"·已å˜åœ¨"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:525
+msgid "Special files cannot be copied"
+msgstr ""
-#. use the generic error message
-#: ../thunar-vfs/thunar-vfs-xfer.c:398
-#, c-format
-msgid "Failed to open \"%s\" for writing"
-msgstr "無法開啟 \"%s\" 來寫入"
+#: ../thunar-vfs/thunar-vfs-io-local-xfer.c:605
+msgid "Symbolic links are not supported"
+msgstr "尚未支æ´ç¬¦è™Ÿé€£çµ"
-#: ../thunar-vfs/thunar-vfs-xfer.c:419
-#, c-format
-msgid "Failed to read data from \"%s\""
-msgstr "無法從 \"%s\" 讀å–資料"
+#. ...and a special display name
+#: ../thunar-vfs/thunar-vfs-io-local.c:304
+msgid "File System"
+msgstr "檔案系統"
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:223
+#, fuzzy, c-format
+msgid "Failed to copy \"%s\" to \"%s\""
+msgstr "無法將·\"%s\" é‡å‘½å為 \"%s\"."
+
+#. impossible to perform the link operation
+#: ../thunar-vfs/thunar-vfs-io-ops.c:271
+msgid "Links from or to resources in the trash are not supported"
+msgstr ""
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:289
+#, fuzzy, c-format
+msgid "Failed to link \"%s\" to \"%s\""
+msgstr "無法將·\"%s\" é‡å‘½å為 \"%s\"."
+
+#. generate a useful error message
+#: ../thunar-vfs/thunar-vfs-io-ops.c:366
+#, fuzzy, c-format
+msgid "Failed to move \"%s\" to \"%s\""
+msgstr "無法將·\"%s\" é‡å‘½å為 \"%s\"."
-#: ../thunar-vfs/thunar-vfs-xfer.c:435
+#: ../thunar-vfs/thunar-vfs-io-trash.c:601
+#, fuzzy, c-format
+msgid "The URI \"%s\" does not refer to a valid resource in the trash"
+msgstr "æ¤è·¯å¾‘è¨å®šÂ·\"%s\"·並未指å‘æ£ç¢ºçš„目錄"
+
+#: ../thunar-vfs/thunar-vfs-io-trash.c:778
+msgid "Trash"
+msgstr ""
+
+#. we don't support copying files within the trash
+#. we don't support moving files within the trash
+#: ../thunar-vfs/thunar-vfs-io-trash.c:972
+#: ../thunar-vfs/thunar-vfs-io-trash.c:1086
+msgid "Cannot move or copy files within the trash"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1684
#, c-format
-msgid "Failed to write data to \"%s\""
-msgstr "無法將資料寫入 \"%s\""
+msgid "Failed to load application from file %s"
+msgstr "無法由檔案 %s 載入應用程å¼"
-#. display an error to the user
-#: ../thunar-vfs/thunar-vfs-xfer.c:454 ../thunar/thunar-chooser-dialog.c:805
+#. tell the user that we failed to delete the application launcher
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1750
#, c-format
-msgid "Failed to remove \"%s\""
-msgstr "無法移除 \"%s\""
+msgid "Failed to remove \"%s\": %s"
+msgstr "無法移除 \"%s\"：%s"
-#. tell the caller that the job was cancelled
-#: ../thunar-vfs/thunar-vfs-xfer.c:459
-msgid "Operation canceled"
-msgstr "æ“作å–消"
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:132
+msgid "Command"
+msgstr "指令"
-#: ../thunar-vfs/thunar-vfs-xfer.c:500
-#, c-format
-msgid "Failed to read link target from \"%s\""
-msgstr "無法讀å–連çµç›®æ¨™ \"%s\""
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:133
+msgid "The command to run the mime handler"
+msgstr "執行 mime 處置元的指令"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:145
+msgid "Flags"
+msgstr "旗標"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:146
+msgid "The flags for the mime handler"
+msgstr "mime 處置元的旗標"
-#: ../thunar-vfs/thunar-vfs-xfer.c:508 ../thunar-vfs/thunar-vfs-xfer.c:626
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:161
+msgid "Icon"
+msgstr "圖示"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:162
+msgid "The icon of the mime handler"
+msgstr "mime 處置元的圖示"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:174
+#: ../thunar/thunar-enum-types.c:94 ../thunar/thunar-renamer-dialog.c:426
+#: ../thunarx/thunarx-renamer.c:177
+msgid "Name"
+msgstr "å稱"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:175
+msgid "The name of the mime handler"
+msgstr "mime 處置元的å稱"
+
+#: ../thunar-vfs/thunar-vfs-mime-info.c:229
#, c-format
-msgid "Failed to create symbolic link \"%s\""
-msgstr "ç„¡æ³•å»ºç«‹ç¬¦è™Ÿé€£çµ \"%s\""
+msgid "%s document"
+msgstr "%s 文件"
-#: ../thunar-vfs/thunar-vfs-xfer.c:516
+#: ../thunar-vfs/thunar-vfs-path.c:362
#, c-format
-msgid "Failed to change mode of \"%s\""
-msgstr "無法更改 \"%s\" 的模å¼"
+msgid "The URI \"%s\" is invalid"
+msgstr ""
-#: ../thunar-vfs/thunar-vfs-xfer.c:526 ../thunar-vfs/thunar-vfs-xfer.c:635
-msgid "Symbolic links are not supported"
-msgstr "尚未支æ´ç¬¦è™Ÿé€£çµ"
+#: ../thunar-vfs/thunar-vfs-path.c:835
+msgid "Path too long to fit into buffer"
+msgstr "路徑太長，無法放入緩è¡å€"
+
+#: ../thunar-vfs/thunar-vfs-path.c:938
+msgid "URI too long to fit into buffer"
+msgstr "URI 太長，無法放入緩è¡å€"
-#: ../thunar-vfs/thunar-vfs-xfer.c:554 ../thunar-vfs/thunar-vfs-xfer.c:615
+#. TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396)
+#: ../thunar-vfs/thunar-vfs-private.c:295
+msgid "Invalidly escaped characters"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:172 ../thunar/thunar-enum-types.c:97
+msgid "Size"
+msgstr "大å°"
+
+#: ../thunar-vfs/thunar-vfs-thumb.c:173
+msgid "The desired thumbnail size"
+msgstr "指定縮圖大å°"
+
+#. update the progress information
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:174
+msgid "Collecting files..."
+msgstr "è’集檔案ä¸..."
+
+#: ../thunar-vfs/thunar-vfs-util.c:251
+msgid "Invalid path"
+msgstr "無效的路徑"
+
+#: ../thunar-vfs/thunar-vfs-util.c:287
#, c-format
-msgid "Failed to determine file info for \"%s\""
-msgstr "無法決定 \"%s\" 的檔案資訊"
+msgid "Unknown user \"%s\""
+msgstr "未知的使用者 \"%s\""
-#: ../thunar-vfs/thunar-vfs-xfer.c:583
+#. something went wrong, for sure
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:317
+#, c-format
+msgid "Failed to determine the mount point for %s"
+msgstr "無法決定 %s 的掛載點"
+
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:804
#, c-format
-msgid "Failed to copy special file \"%s\""
-msgstr "無法複製特殊檔案 \"%s\""
+msgid "Failed to connect to the HAL daemon: %s"
+msgstr "無法連çµè‡³Â·HAL·æœå‹™:·%s"
#: ../thunar/main.c:54
msgid "Open the bulk rename dialog"
@@ -502,137 +460,222 @@ msgid "Sort items in descending order"
msgstr "按照下é™çš„é †åºæŽ’列"
#. display an error message to the user
-#: ../thunar/thunar-application.c:335
+#: ../thunar/thunar-application.c:379
msgid "Failed to launch operation"
msgstr "æ“作無法啟動"
#. tell the user that we were unable to launch the file specified on the cmdline
-#: ../thunar/thunar-application.c:787
+#: ../thunar/thunar-application.c:832
#, c-format
msgid "Failed to open \"%s\""
msgstr "無法開啟 \"%s\""
-#: ../thunar/thunar-application.c:799
+#: ../thunar/thunar-application.c:844
#, c-format
msgid "Failed to open \"%s\": %s"
msgstr "無法開啟 \"%s\": %s"
-#: ../thunar/thunar-application.c:836 ../thunar/thunar-application.c:869
+#: ../thunar/thunar-application.c:881 ../thunar/thunar-application.c:914
msgid "Copying files..."
msgstr "複製檔案ä¸..."
-#: ../thunar/thunar-application.c:903
+#: ../thunar/thunar-application.c:948
msgid "Creating symbolic links..."
msgstr "建立符號連çµä¸..."
-#: ../thunar/thunar-application.c:938
+#: ../thunar/thunar-application.c:988
+#, fuzzy
+msgid "Moving files into the trash..."
+msgstr "移動檔案ä¸..."
+
+#: ../thunar/thunar-application.c:993
msgid "Moving files..."
msgstr "移動檔案ä¸..."
-#: ../thunar/thunar-application.c:973
+#: ../thunar/thunar-application.c:1073
+#, c-format
+msgid ""
+"Are you sure that you want to\n"
+"permanently delete \"%s\"?"
+msgstr ""
+"您確定è¦å¾¹åº•åˆªé™¤\n"
+"所é¸çš„檔案·\"%s\"?"
+
+#: ../thunar/thunar-application.c:1078
+#, c-format
+msgid ""
+"Are you sure that you want to permanently\n"
+"delete the selected file?"
+msgid_plural ""
+"Are you sure that you want to permanently\n"
+"delete the %u selected files?"
+msgstr[0] ""
+"您確定è¦å¾¹åº•åˆªé™¤\n"
+"所é¸çš„檔案嗎？"
+
+#: ../thunar/thunar-application.c:1098
+msgid "If you delete a file, it is permanently lost."
+msgstr "如果您刪除了檔案，將å†ä¹Ÿæ‰¾ä¸å›žä¾†ã€‚"
+
+#: ../thunar/thunar-application.c:1108
msgid "Deleting files..."
msgstr "刪除檔案ä¸..."
-#: ../thunar/thunar-application.c:1013
+#: ../thunar/thunar-application.c:1160
msgid "Creating files..."
msgstr "建立檔案ä¸..."
-#: ../thunar/thunar-application.c:1053
+#: ../thunar/thunar-application.c:1200
msgid "Creating directories..."
msgstr "建立目錄ä¸..."
+#: ../thunar/thunar-application.c:1238
+msgid "Remove all files and folders from the Trash?"
+msgstr ""
+
+#. add the "Empty Trash" action
+#. append the "Empty Trash" menu action
+#. add the "Empty Trash" menu item
+#: ../thunar/thunar-application.c:1243
+#: ../thunar/thunar-location-buttons.c:1264
+#: ../thunar/thunar-shortcuts-view.c:854 ../thunar/thunar-tree-view.c:1075
+#: ../plugins/thunar-tpa/main.c:49
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "空白文件(_E)"
+
+#: ../thunar/thunar-application.c:1247
+msgid ""
+"If you choose to empty the Trash, all items in it will be permanently lost. "
+"Please note that you can also delete them separately."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1264
+msgid "Emptying the Trash..."
+msgstr ""
+
+#: ../thunar/thunar-application.c:1318
+#, fuzzy, c-format
+msgid "Failed to determine the original path for \"%s\""
+msgstr "無法決定 %s 的掛載點"
+
+#: ../thunar/thunar-application.c:1346
+#, fuzzy, c-format
+msgid "Create the folder \"%s\"?"
+msgstr "åœ¨æ¤ \"%s\" 建立新的資料夾"
+
+#: ../thunar/thunar-application.c:1350
+#, fuzzy
+msgid "C_reate Folder"
+msgstr "建立資料夾(_F)..."
+
+#: ../thunar/thunar-application.c:1356
+#, c-format
+msgid ""
+"The folder \"%s\" does not exist anymore, but it is required to restore the "
+"file \"%s\" from the trash. Do you want to create the folder again?"
+msgstr ""
+
+#. display an error dialog
+#: ../thunar/thunar-application.c:1393
+#, fuzzy, c-format
+msgid "Failed to restore \"%s\""
+msgstr "無法移除 \"%s\""
+
+#: ../thunar/thunar-application.c:1400
+#, fuzzy
+msgid "Restoring files..."
+msgstr "刪除檔案ä¸..."
+
#. tell the user that it didn't work
#. display an error to the user
-#: ../thunar/thunar-chooser-button.c:282 ../thunar/thunar-chooser-dialog.c:524
+#: ../thunar/thunar-chooser-button.c:274 ../thunar/thunar-chooser-dialog.c:505
#, c-format
msgid "Failed to set default application for \"%s\""
msgstr "無法為 \"%s\" è¨å®šé è¨æ‡‰ç”¨ç¨‹å¼"
-#: ../thunar/thunar-chooser-button.c:368
+#: ../thunar/thunar-chooser-button.c:359
msgid "No application selected"
msgstr "未é¸å–任何應用程å¼"
-#. setup a useful tooltip and ATK description
-#: ../thunar/thunar-chooser-button.c:373
+#: ../thunar/thunar-chooser-button.c:365
#, c-format
msgid ""
"The selected application is used to open this and other files of type \"%s\"."
msgstr "é¸å–的應用程å¼ç”¨ä¾†é–‹å•Ÿæœ¬æª”案和其他 \"%s\" å½¢å¼çš„檔案"
#. add the "Other Application..." choice
-#: ../thunar/thunar-chooser-button.c:514
+#: ../thunar/thunar-chooser-button.c:503
msgid "_Other Application..."
msgstr "其他應用程å¼(_O)"
-#: ../thunar/thunar-chooser-dialog.c:225 ../thunar/thunar-launcher.c:132
+#: ../thunar/thunar-chooser-dialog.c:219 ../thunar/thunar-launcher.c:132
msgid "Open With"
msgstr "以...開啟"
#. create the "Custom command" expand
-#: ../thunar/thunar-chooser-dialog.c:291
+#: ../thunar/thunar-chooser-dialog.c:285
msgid "Use a _custom command:"
msgstr "使用自訂的指令："
-#: ../thunar/thunar-chooser-dialog.c:292
+#: ../thunar/thunar-chooser-dialog.c:286
msgid ""
"Use a custom command for an application that is not available from the above "
"application list."
msgstr "使用自訂的指令來執行上é¢æ‡‰ç”¨ç¨‹å¼æ¸…å–®ä¸æ‰€æ²’有的應用程å¼ã€‚"
#. create the "Custom command" button
-#: ../thunar/thunar-chooser-dialog.c:311
+#: ../thunar/thunar-chooser-dialog.c:305
msgid "_Browse..."
msgstr "ç€è¦½(_B)..."
#. create the "Use as default for this kind of file" button
-#: ../thunar/thunar-chooser-dialog.c:317
+#: ../thunar/thunar-chooser-dialog.c:311
msgid "Use as _default for this kind of file"
msgstr "è¨ç‚ºæ¤é¡žæª”案的é è¨æ¨¡å¼(_D)"
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:499
+#: ../thunar/thunar-chooser-dialog.c:480
#, c-format
msgid "Failed to add new application \"%s\""
msgstr "無法新增新的應用程å¼\"%s\""
#. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:544
+#: ../thunar/thunar-chooser-dialog.c:525
#, c-format
msgid "Failed to execute \"%s\""
msgstr "無法執行\"%s\""
#. append the "Remove Launcher" item
-#: ../thunar/thunar-chooser-dialog.c:622
+#: ../thunar/thunar-chooser-dialog.c:603
msgid "_Remove Launcher"
msgstr "移除快速啟動(_R)"
#. update the header label
-#: ../thunar/thunar-chooser-dialog.c:723
+#: ../thunar/thunar-chooser-dialog.c:704
#, c-format
msgid "Open <i>%s</i> and other files of type \"%s\" with:"
msgstr "開啟 <i>%s</i> 和其他 \"%s\" 類型的檔案，使用： "
-#. update the "Browse..." tooltip
-#: ../thunar/thunar-chooser-dialog.c:730
+#: ../thunar/thunar-chooser-dialog.c:712
#, c-format
msgid ""
"Browse the file system to select an application to open files of type \"%s\"."
msgstr "ç€è¦½æª”案系統以é¸å–一應用程å¼ä¾†é–‹å•Ÿ \"%s\" 類型的檔案"
-#. update the "Use as default for this kind of file" tooltip
-#: ../thunar/thunar-chooser-dialog.c:736
+#: ../thunar/thunar-chooser-dialog.c:718
#, c-format
msgid ""
"Change the default application for files of type \"%s\" to the selected "
"application."
msgstr "將開啟 \"%s\" 類型檔案的é è¨æ‡‰ç”¨ç¨‹å¼æ”¹è¨ç‚ºæ‰€é¸å–者。"
-#: ../thunar/thunar-chooser-dialog.c:784
+#: ../thunar/thunar-chooser-dialog.c:765
#, c-format
msgid "Are you sure that you want to remove \"%s\"?"
msgstr "您確定è¦åˆªé™¤ \"%s\"？"
-#: ../thunar/thunar-chooser-dialog.c:790
+#: ../thunar/thunar-chooser-dialog.c:771
msgid ""
"This will remove the application launcher that appears in the file context "
"menu, but will not uninstall the application itself.\n"
@@ -645,39 +688,39 @@ msgstr ""
"您å¯ä»¥é¸æ“‡åªç§»é™¤é€éŽåœ¨æª”案總管ä¸åˆ©ç”¨ \"以其他程å¼é–‹å•Ÿ\" çš„é¸é …所建立的檔案開"
"å•Ÿæ–¹å¼ã€‚"
-#: ../thunar/thunar-chooser-dialog.c:831
+#: ../thunar/thunar-chooser-dialog.c:812
#: ../plugins/thunar-uca/thunar-uca-editor.c:491
msgid "Select an Application"
msgstr "é¸æ“‡ä¸€å€‹æ‡‰ç”¨ç¨‹å¼"
-#: ../thunar/thunar-chooser-dialog.c:841
-#: ../thunar/thunar-renamer-dialog.c:1103
+#: ../thunar/thunar-chooser-dialog.c:822
+#: ../thunar/thunar-renamer-dialog.c:1094
#: ../plugins/thunar-uca/thunar-uca-editor.c:501
#: ../plugins/thunar-uca/thunar-uca-editor.c:654
msgid "All Files"
msgstr "所有檔案"
-#: ../thunar/thunar-chooser-dialog.c:846
+#: ../thunar/thunar-chooser-dialog.c:827
#: ../plugins/thunar-uca/thunar-uca-editor.c:506
msgid "Executable Files"
msgstr "å¯åŸ·è¡Œæª”"
-#: ../thunar/thunar-chooser-dialog.c:861
+#: ../thunar/thunar-chooser-dialog.c:842
#: ../plugins/thunar-uca/thunar-uca-editor.c:521
msgid "Perl Scripts"
msgstr "Perl 指令稿"
-#: ../thunar/thunar-chooser-dialog.c:867
+#: ../thunar/thunar-chooser-dialog.c:848
#: ../plugins/thunar-uca/thunar-uca-editor.c:527
msgid "Python Scripts"
msgstr "Python 指令稿"
-#: ../thunar/thunar-chooser-dialog.c:873
+#: ../thunar/thunar-chooser-dialog.c:854
#: ../plugins/thunar-uca/thunar-uca-editor.c:533
msgid "Ruby Scripts"
msgstr "Ruby 指令稿"
-#: ../thunar/thunar-chooser-dialog.c:879
+#: ../thunar/thunar-chooser-dialog.c:860
#: ../plugins/thunar-uca/thunar-uca-editor.c:539
msgid "Shell Scripts"
msgstr "Shell 指令稿"
@@ -697,7 +740,7 @@ msgid "Other Applications"
msgstr "其他應用程å¼"
#. tell the user that we cannot paste
-#: ../thunar/thunar-clipboard-manager.c:361
+#: ../thunar/thunar-clipboard-manager.c:362
msgid "There is nothing on the clipboard to paste"
msgstr "剪貼簿ä¸æ²’有æ±è¥¿å¯ä»¥è²¼ä¸Š"
@@ -762,14 +805,15 @@ msgstr ""
msgid "Automatically _expand columns as needed"
msgstr "ä¾éœ€æ±‚自動延展欄ä½(_E)"
+#. the file_time is invalid
#. reset page title
#. tell the user that we're unable to determine the file info
#: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:726
#: ../thunar/thunar-list-model.c:755
-#: ../thunar/thunar-permissions-chooser.c:270
+#: ../thunar/thunar-permissions-chooser.c:270 ../thunar/thunar-util.c:112
#: ../plugins/thunar-apr/thunar-apr-desktop-page.c:469
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:286
#: ../plugins/thunar-apr/thunar-apr-image-page.c:287
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:288
msgid "Unknown"
msgstr "未知的"
@@ -781,7 +825,7 @@ msgstr "目錄清單"
msgid "Compact view"
msgstr "簡潔檢視"
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2260
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2206
msgid "Enter the new name:"
msgstr "輸入新å稱："
@@ -807,16 +851,32 @@ msgstr "詳細目錄列表"
msgid "Details view"
msgstr "詳細檢視"
-#: ../thunar/thunar-dialogs.c:96
+#: ../thunar/thunar-dialogs.c:101
msgid "translator-credits"
msgstr "Cosmo Chene <cosmolax@gmail.com>"
#. display an error message to the user
#. tell the user that we failed
-#: ../thunar/thunar-dialogs.c:255 ../thunar/thunar-renamer-dialog.c:989
+#: ../thunar/thunar-dialogs.c:228 ../thunar/thunar-renamer-dialog.c:980
msgid "Failed to open the documentation browser"
msgstr "無法開啟文件ç€è¦½å™¨"
+#: ../thunar/thunar-dialogs.c:321
+msgid "_Yes"
+msgstr "是(_Y)"
+
+#: ../thunar/thunar-dialogs.c:325
+msgid "Yes to _all"
+msgstr "全部皆是(_A)"
+
+#: ../thunar/thunar-dialogs.c:329
+msgid "_No"
+msgstr "å¦(_N)"
+
+#: ../thunar/thunar-dialogs.c:334
+msgid "_Cancel"
+msgstr "å–消(_C)"
+
#: ../thunar/thunar-dnd.c:62
msgid "_Copy here"
msgstr "複製到這裡(_C)"
@@ -871,7 +931,7 @@ msgstr "æ“有者"
#.
#. Permissions chooser
#.
-#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:455
+#: ../thunar/thunar-enum-types.c:96 ../thunar/thunar-properties-dialog.c:490
msgid "Permissions"
msgstr "權é™"
@@ -887,14 +947,10 @@ msgstr "檔案"
msgid "File Name"
msgstr "檔案å稱"
-#: ../thunar/thunar-file.c:783
+#: ../thunar/thunar-file.c:795
msgid "The root folder has no parent"
msgstr "æ²’æœ‰æ¯”æ ¹ç›®éŒ„æ›´ä¸Šå±¤çš„ç›®éŒ„"
-#: ../thunar/thunar-file.c:1122
-msgid "File System"
-msgstr "檔案系統"
-
#. create the "back" action
#: ../thunar/thunar-history.c:179
msgid "Back"
@@ -928,14 +984,14 @@ msgstr "圖示檢視"
#. append the "Open" menu action
#: ../thunar/thunar-launcher.c:129 ../thunar/thunar-launcher.c:775
-#: ../thunar/thunar-location-buttons.c:1217
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:1014
+#: ../thunar/thunar-location-buttons.c:1219
+#: ../thunar/thunar-shortcuts-view.c:795 ../thunar/thunar-tree-view.c:1015
msgid "_Open"
msgstr "é–‹å•Ÿ(_O)"
#. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1230
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:1026
+#: ../thunar/thunar-launcher.c:130 ../thunar/thunar-location-buttons.c:1232
+#: ../thunar/thunar-shortcuts-view.c:806 ../thunar/thunar-tree-view.c:1027
msgid "Open in New Window"
msgstr "在新視窗ä¸é–‹å•Ÿ"
@@ -1057,119 +1113,138 @@ msgid "Send the selected file to \"%s\""
msgid_plural "Send the selected files to \"%s\""
msgstr[0] "郵寄é¸æ“‡çš„檔案至 \"%s\""
-#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:724
+#: ../thunar/thunar-list-model.c:774 ../thunar/thunar-properties-dialog.c:759
msgid "broken link"
msgstr "連çµå¤±æ•ˆ"
#. generate a text which includes the size of all items in the folder
-#: ../thunar/thunar-list-model.c:2197
+#: ../thunar/thunar-list-model.c:2202
#, c-format
msgid "%d item (%s), Free space: %s"
msgid_plural "%d items (%s), Free space: %s"
msgstr[0] "%d å€‹é …ç›®ï¼Œå¯ç”¨ç©ºé–“ %s"
#. just the standard text
-#: ../thunar/thunar-list-model.c:2206
+#: ../thunar/thunar-list-model.c:2211
#, c-format
msgid "%d item, Free space: %s"
msgid_plural "%d items, Free space: %s"
msgstr[0] "%d å€‹é …ç›®ï¼Œå¯ç”¨ç©ºé–“ %s"
-#: ../thunar/thunar-list-model.c:2214
+#: ../thunar/thunar-list-model.c:2219
#, c-format
msgid "%d item"
msgid_plural "%d items"
msgstr[0] "%d å€‹é …ç›®"
-#: ../thunar/thunar-list-model.c:2230
+#: ../thunar/thunar-list-model.c:2235
#, c-format
msgid "\"%s\" broken link"
msgstr " \"%s\" 連çµå¤±æ•ˆ"
-#: ../thunar/thunar-list-model.c:2234
+#: ../thunar/thunar-list-model.c:2239
#, c-format
msgid "\"%s\" (%s) link to %s"
msgstr "\"%s\" (%s) 連çµè‡³ %s"
-#: ../thunar/thunar-list-model.c:2239
+#: ../thunar/thunar-list-model.c:2244
#, c-format
msgid "\"%s\" (%s) %s"
msgstr "\"%s\" (%s) %s"
-#: ../thunar/thunar-list-model.c:2256
+#. TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+#. * where the trashed file/folder was located before it was moved to the trash), otherwise the
+#. * properties dialog width will be messed up.
+#.
+#: ../thunar/thunar-list-model.c:2255 ../thunar/thunar-properties-dialog.c:339
+msgid "Original Path:"
+msgstr ""
+
+#
+#. append the image dimensions to the statusbar text
+#: ../thunar/thunar-list-model.c:2267
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:151
+msgid "Image Size:"
+msgstr "圖片大å°:"
+
+#: ../thunar/thunar-list-model.c:2286
#, c-format
msgid "%d item selected (%s)"
msgid_plural "%d items selected (%s)"
msgstr[0] "å·²é¸å– %d å€‹é …ç›®(%s)"
-#: ../thunar/thunar-list-model.c:2261
+#: ../thunar/thunar-list-model.c:2291
#, c-format
msgid "%d item selected"
msgid_plural "%d items selected"
msgstr[0] "å·²é¸å– %d å€‹é …ç›®"
-#: ../thunar/thunar-location-buttons.c:259
+#: ../thunar/thunar-location-buttons.c:261
msgid "Spacing"
msgstr "é–“éš”"
-#: ../thunar/thunar-location-buttons.c:260
+#: ../thunar/thunar-location-buttons.c:262
msgid "The amount of space between the path buttons"
msgstr "路徑按鈕之間間隔的大å°"
#. add the "Open" action
-#: ../thunar/thunar-location-buttons.c:1216
+#: ../thunar/thunar-location-buttons.c:1218
#, c-format
msgid "Open \"%s\" in this window"
msgstr "在本視窗ä¸é–‹å•Ÿ \"%s\""
#. add the "Open in New Window" action
-#: ../thunar/thunar-location-buttons.c:1229
+#: ../thunar/thunar-location-buttons.c:1231
#, c-format
msgid "Open \"%s\" in a new window"
msgstr "在新視窗ä¸é–‹å•Ÿ \"%s\""
#. add the "Create Folder" action
-#: ../thunar/thunar-location-buttons.c:1244
+#: ../thunar/thunar-location-buttons.c:1249
#, c-format
msgid "Create a new folder in \"%s\""
msgstr "åœ¨æ¤ \"%s\" 建立新的資料夾"
#. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1245
-#: ../thunar/thunar-standard-view.c:312 ../thunar/thunar-tree-view.c:1073
+#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1091
msgid "Create _Folder..."
msgstr "建立資料夾(_F)..."
+#: ../thunar/thunar-location-buttons.c:1264
+msgid "Delete all files and folders in the Trash"
+msgstr ""
+
#. add the "Paste Into Folder" action
-#: ../thunar/thunar-location-buttons.c:1260
+#: ../thunar/thunar-location-buttons.c:1279
#, c-format
msgid ""
"Move or copy files previously selected by a Cut or Copy command into \"%s\""
msgstr "將之å‰è¤‡è£½æˆ–剪下的檔案在æ¤è¤‡è£½æˆ–移動到·\"%s\""
-#: ../thunar/thunar-location-buttons.c:1261
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-location-buttons.c:1280
+#: ../thunar/thunar-standard-view.c:321
msgid "Paste Into Folder"
msgstr "貼到資料夾ä¸"
#. add the "Properties" action
-#: ../thunar/thunar-location-buttons.c:1276
+#: ../thunar/thunar-location-buttons.c:1295
#, c-format
msgid "View the properties of the folder \"%s\""
msgstr "檢視資料夾 \"%s\" 內容資訊"
-#: ../thunar/thunar-location-buttons.c:1277
+#: ../thunar/thunar-location-buttons.c:1296
msgid "_Properties"
msgstr "內容(_P)"
#. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "New Folder"
msgstr "新資料夾"
-#: ../thunar/thunar-location-buttons.c:1346
-#: ../thunar/thunar-standard-view.c:1790 ../thunar/thunar-tree-view.c:1428
+#: ../thunar/thunar-location-buttons.c:1365
+#: ../thunar/thunar-standard-view.c:1784 ../thunar/thunar-tree-view.c:1447
msgid "Create New Folder"
msgstr "建立新資料夾"
@@ -1186,11 +1261,11 @@ msgstr "ä½å€(_L)"
msgid "Failed to launch \"%s\""
msgstr "無法啟動 \"%s\""
-#: ../thunar/thunar-path-entry.c:254
+#: ../thunar/thunar-path-entry.c:258
msgid "Icon size"
msgstr "圖示大å°"
-#: ../thunar/thunar-path-entry.c:255
+#: ../thunar/thunar-path-entry.c:259
msgid "The icon size for the path entry"
msgstr "æ¤è·¯å¾‘內的圖示大å°"
@@ -1272,17 +1347,15 @@ msgid "Stop applying permissions recursively."
msgstr "åœæ¢éžè¿´å¥—用權é™çš„動作。"
#. allocate the question dialog
-#: ../thunar/thunar-permissions-chooser.c:590
-#: ../thunar/thunar-permissions-chooser.c:1135
-#: ../thunar/thunar-progress-dialog.c:305
+#: ../thunar/thunar-permissions-chooser.c:587
msgid "Question"
msgstr "è¦å‘Š"
-#: ../thunar/thunar-permissions-chooser.c:614
+#: ../thunar/thunar-permissions-chooser.c:611
msgid "Apply recursively?"
msgstr "è¦éžè¿´å¥—用？"
-#: ../thunar/thunar-permissions-chooser.c:620
+#: ../thunar/thunar-permissions-chooser.c:617
msgid ""
"Do you want to apply your changes recursively to\n"
"all files and subfolders below the selected folder?"
@@ -1290,11 +1363,11 @@ msgstr ""
"您想è¦å°‡è®Šæ›´å¥—用到所é¸çš„資料夾內å«çš„\n"
"所有檔案以åŠå目錄嗎？"
-#: ../thunar/thunar-permissions-chooser.c:625
+#: ../thunar/thunar-permissions-chooser.c:622
msgid "Do _not ask me again"
msgstr "ä¸ç”¨å†å•æˆ‘(_N)"
-#: ../thunar/thunar-permissions-chooser.c:626
+#: ../thunar/thunar-permissions-chooser.c:623
msgid ""
"If you select this option your choice will be remembered and you won't be "
"asked again. You can use the preferences dialog to alter your choice "
@@ -1304,29 +1377,29 @@ msgstr ""
"ä¸è®Šæ›´åˆ¥çš„è¨å®šæ–¹å¼ã€‚"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:706
+#: ../thunar/thunar-permissions-chooser.c:703
msgid "Failed to change group"
msgstr "無法變更群組"
#. display an error to the user
-#: ../thunar/thunar-permissions-chooser.c:759
-#: ../thunar/thunar-permissions-chooser.c:1094
+#: ../thunar/thunar-permissions-chooser.c:756
+#: ../thunar/thunar-permissions-chooser.c:1091
msgid "Failed to apply new permissions"
msgstr "無法套用新的權é™è¨å®š"
-#: ../thunar/thunar-permissions-chooser.c:937
+#: ../thunar/thunar-permissions-chooser.c:934
msgid "Unknown file owner"
msgstr "未知檔案æ“有者"
-#: ../thunar/thunar-permissions-chooser.c:1068
+#: ../thunar/thunar-permissions-chooser.c:1065
msgid "Correct folder permissions automatically?"
msgstr "è¦è‡ªå‹•æ›´æ£è³‡æ–™å¤¾æ¬Šé™å—Žï¼Ÿ"
-#: ../thunar/thunar-permissions-chooser.c:1070
+#: ../thunar/thunar-permissions-chooser.c:1067
msgid "Correct folder permissions"
msgstr "æ›´æ£è³‡æ–™å¤¾æ¬Šé™"
-#: ../thunar/thunar-permissions-chooser.c:1072
+#: ../thunar/thunar-permissions-chooser.c:1069
msgid ""
"The folder permissions will be reset to a consistent state. Only users "
"allowed to read the contents of this folder will be allowed to enter the "
@@ -1335,85 +1408,65 @@ msgstr ""
"資料夾權é™å°‡è¢«è¨å®šç‚ºå®Œå…¨è¨±å¯ç‹€æ…‹ã€‚原本å°è³‡æ–™å¤¾åªæ“有讀å–權é™çš„使用者將å¯é€²å…¥"
"資料夾進行其他的æ“作行為。"
-#: ../thunar/thunar-permissions-chooser.c:1164
-#: ../thunar/thunar-progress-dialog.c:372
-msgid "_Yes"
-msgstr "是(_Y)"
-
-#: ../thunar/thunar-permissions-chooser.c:1168
-#: ../thunar/thunar-progress-dialog.c:377
-msgid "Yes to _all"
-msgstr "全部皆是(_A)"
-
-#: ../thunar/thunar-permissions-chooser.c:1172
-#: ../thunar/thunar-progress-dialog.c:382
-msgid "_No"
-msgstr "å¦(_N)"
-
-#: ../thunar/thunar-permissions-chooser.c:1176
-#: ../thunar/thunar-progress-dialog.c:387
-msgid "_Cancel"
-msgstr "å–消(_C)"
-
-#: ../thunar/thunar-preferences-dialog.c:229
+#: ../thunar/thunar-preferences-dialog.c:222
msgid "File Manager Preferences"
msgstr "檔案總管è¨å®šé¸é …"
#.
#. Views
#.
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:239
msgid "Views"
msgstr "檢視"
-#: ../thunar/thunar-preferences-dialog.c:256
+#: ../thunar/thunar-preferences-dialog.c:249
msgid "Default View"
msgstr "é è¨æª¢è¦–"
-#: ../thunar/thunar-preferences-dialog.c:268
+#: ../thunar/thunar-preferences-dialog.c:261
msgid "View _new folders using:"
msgstr "檢視資料夾的è¨å®š(_N):"
-#: ../thunar/thunar-preferences-dialog.c:273
-#: ../thunar/thunar-preferences-dialog.c:310
+#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:303
msgid "Icon View"
msgstr "檢視圖示"
-#: ../thunar/thunar-preferences-dialog.c:274
+#: ../thunar/thunar-preferences-dialog.c:267
msgid "Detailed List View"
msgstr "詳細清單檢視"
-#: ../thunar/thunar-preferences-dialog.c:275
+#: ../thunar/thunar-preferences-dialog.c:268
msgid "Compact List View"
msgstr "簡潔清單檢視"
-#: ../thunar/thunar-preferences-dialog.c:276
+#: ../thunar/thunar-preferences-dialog.c:269
msgid "Last Active View"
msgstr "上次的檢視狀態"
-#: ../thunar/thunar-preferences-dialog.c:293
+#: ../thunar/thunar-preferences-dialog.c:286
msgid "Sort _folders before files"
msgstr "處ç†æª”案å‰å…ˆé‡æ•´è³‡æ–™å¤¾(_F)"
-#: ../thunar/thunar-preferences-dialog.c:295
+#: ../thunar/thunar-preferences-dialog.c:288
msgid "Select this option to list folders before files when you sort a folder."
msgstr "é¸æ“‡æ¤é¸é …以便在é‡æ–°æ•´ç†è³‡æ–™å¤¾æ™‚優先處ç†è³‡æ–™å¤¾ç„¶å¾Œå†è™•ç†æª”案。"
-#: ../thunar/thunar-preferences-dialog.c:299
+#: ../thunar/thunar-preferences-dialog.c:292
msgid "_Show thumbnails"
msgstr "顯示縮圖(_S)"
-#: ../thunar/thunar-preferences-dialog.c:301
+#: ../thunar/thunar-preferences-dialog.c:294
msgid ""
"Select this option to display previewable files within a folder as "
"automatically generated thumbnail icons."
msgstr "é¸æ“‡æ¤é¸é …以便在è¨å®šå¯é 覽的資料夾ä¸Â·é¡¯ç¤ºè‡ªå‹•ç”¢ç”Ÿçš„縮圖圖示。"
-#: ../thunar/thunar-preferences-dialog.c:322
+#: ../thunar/thunar-preferences-dialog.c:315
msgid "_Text beside icons"
msgstr "æ–‡å—ä½æ–¼åæ—(_T)"
-#: ../thunar/thunar-preferences-dialog.c:324
+#: ../thunar/thunar-preferences-dialog.c:317
msgid ""
"Select this option to place the icon captions for items beside the icon "
"rather than below the icon."
@@ -1422,58 +1475,58 @@ msgstr "é¸æ“‡æ¤é¸é …å¯å°‡åœ–示說明放在圖示åæ—·而ä¸æ˜¯ä½æ–¼åœ–
#.
#. Side Pane
#.
-#: ../thunar/thunar-preferences-dialog.c:333
+#: ../thunar/thunar-preferences-dialog.c:326
msgid "Side Pane"
msgstr "å´é‚Šæ¬„"
-#: ../thunar/thunar-preferences-dialog.c:343
+#: ../thunar/thunar-preferences-dialog.c:336
msgid "Shortcuts Pane"
msgstr "æ·å¾‘列"
-#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:348
msgid "_Icon Size:"
msgstr "圖示大å°(_I)"
-#: ../thunar/thunar-preferences-dialog.c:360
-#: ../thunar/thunar-preferences-dialog.c:411
+#: ../thunar/thunar-preferences-dialog.c:353
+#: ../thunar/thunar-preferences-dialog.c:404
msgid "Very Small"
msgstr "最å°"
-#: ../thunar/thunar-preferences-dialog.c:361
-#: ../thunar/thunar-preferences-dialog.c:412
+#: ../thunar/thunar-preferences-dialog.c:354
+#: ../thunar/thunar-preferences-dialog.c:405
msgid "Smaller"
msgstr "æ›´å°"
-#: ../thunar/thunar-preferences-dialog.c:362
-#: ../thunar/thunar-preferences-dialog.c:413
+#: ../thunar/thunar-preferences-dialog.c:355
+#: ../thunar/thunar-preferences-dialog.c:406
msgid "Small"
msgstr "å°"
-#: ../thunar/thunar-preferences-dialog.c:363
-#: ../thunar/thunar-preferences-dialog.c:414
+#: ../thunar/thunar-preferences-dialog.c:356
+#: ../thunar/thunar-preferences-dialog.c:407
msgid "Normal"
msgstr "æ£å¸¸"
-#: ../thunar/thunar-preferences-dialog.c:364
-#: ../thunar/thunar-preferences-dialog.c:415
+#: ../thunar/thunar-preferences-dialog.c:357
+#: ../thunar/thunar-preferences-dialog.c:408
msgid "Large"
msgstr "大"
-#: ../thunar/thunar-preferences-dialog.c:365
-#: ../thunar/thunar-preferences-dialog.c:416
+#: ../thunar/thunar-preferences-dialog.c:358
+#: ../thunar/thunar-preferences-dialog.c:409
msgid "Larger"
msgstr "更大"
-#: ../thunar/thunar-preferences-dialog.c:366
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:359
+#: ../thunar/thunar-preferences-dialog.c:410
msgid "Very Large"
msgstr "最大"
-#: ../thunar/thunar-preferences-dialog.c:383
+#: ../thunar/thunar-preferences-dialog.c:376
msgid "Show Icon _Emblems"
msgstr "顯示圖示標記(_E)"
-#: ../thunar/thunar-preferences-dialog.c:385
+#: ../thunar/thunar-preferences-dialog.c:378
msgid ""
"Select this option to display icon emblems in the shortcuts pane for all "
"folders for which emblems have been defined in the folders properties dialog."
@@ -1481,19 +1534,19 @@ msgstr ""
"é¸æ“‡æ¤é¸é …以便在å´é‚Šæ¬„æ·å¾‘å€ä¸é¡¯ç¤ºåœ¨è³‡æ–™å¤¾å…§å®¹ä¸å·²æœ‰å®šç¾©æ¨™è¨˜åœ–示的資料夾其所"
"有的標記圖示。"
-#: ../thunar/thunar-preferences-dialog.c:394
+#: ../thunar/thunar-preferences-dialog.c:387
msgid "Tree Pane"
msgstr "樹狀邊欄"
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:399
msgid "Icon _Size:"
msgstr "圖示大å°(_S):"
-#: ../thunar/thunar-preferences-dialog.c:434
+#: ../thunar/thunar-preferences-dialog.c:427
msgid "Show Icon E_mblems"
msgstr "顯示標記圖示(_M)"
-#: ../thunar/thunar-preferences-dialog.c:436
+#: ../thunar/thunar-preferences-dialog.c:429
msgid ""
"Select this option to display icon emblems in the tree pane for all folders "
"for which emblems have been defined in the folders properties dialog."
@@ -1504,16 +1557,19 @@ msgstr ""
#.
#. Behavior
#.
-#: ../thunar/thunar-preferences-dialog.c:445
-#: ../thunar/thunar-preferences-dialog.c:455
+#: ../thunar/thunar-preferences-dialog.c:438
msgid "Behavior"
msgstr "æ»‘é¼ å‹•ä½œ"
-#: ../thunar/thunar-preferences-dialog.c:467
+#: ../thunar/thunar-preferences-dialog.c:448
+msgid "Navigation"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:460
msgid "_Single click to activate items"
msgstr "æŒ‰ä¸€ä¸‹ä»¥å•Ÿç”¨é …ç›®(_S)"
-#: ../thunar/thunar-preferences-dialog.c:487
+#: ../thunar/thunar-preferences-dialog.c:480
msgid ""
"Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"
@@ -1521,7 +1577,7 @@ msgstr ""
"æŒ‡å®šç•¶æ»‘é¼ æŒ‡å‘欲é¸é …目時使其變æˆå·²é¸å–é …\n"
"所需的 延é²ç©ºæª” (_E)長度:"
-#: ../thunar/thunar-preferences-dialog.c:499
+#: ../thunar/thunar-preferences-dialog.c:492
msgid ""
"When single-click activation is enabled, pausing the mouse pointer over an "
"item will automatically select that item after the chosen delay. You can "
@@ -1534,34 +1590,34 @@ msgstr ""
"左邊（åœç”¨ï¼‰ä¹‹è™•å³å¯ã€‚這樣的è¨å®šåœ¨æ‚¨åªæƒ³é¸å–å–®ä¸€é …ç›®ï¼Œä½†å»ä¸æƒ³ç«‹åˆ»åŸ·è¡Œå®ƒæ™‚，"
"將會å分有用。"
-#: ../thunar/thunar-preferences-dialog.c:523
+#: ../thunar/thunar-preferences-dialog.c:516
msgid "Disabled"
msgstr "åœç”¨"
-#: ../thunar/thunar-preferences-dialog.c:529
+#: ../thunar/thunar-preferences-dialog.c:522
msgid "Medium"
msgstr "ä¸"
-#: ../thunar/thunar-preferences-dialog.c:535
+#: ../thunar/thunar-preferences-dialog.c:528
msgid "Long"
msgstr "é•·"
-#: ../thunar/thunar-preferences-dialog.c:541
+#: ../thunar/thunar-preferences-dialog.c:534
msgid "_Double click to activate items"
msgstr "æŒ‰å…©ä¸‹ä»¥å•Ÿç”¨é …ç›®(_D)"
#.
#. Advanced
#.
-#: ../thunar/thunar-preferences-dialog.c:551
+#: ../thunar/thunar-preferences-dialog.c:544
msgid "Advanced"
msgstr "進階"
-#: ../thunar/thunar-preferences-dialog.c:561
+#: ../thunar/thunar-preferences-dialog.c:554
msgid "Folder Permissions"
msgstr "資料夾權é™"
-#: ../thunar/thunar-preferences-dialog.c:573
+#: ../thunar/thunar-preferences-dialog.c:566
msgid ""
"When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
@@ -1571,177 +1627,182 @@ msgstr ""
"套用到資料夾ä¸çš„內容權é™ã€‚請在底下\n"
"é¸æ“‡é è¨çš„行為:"
-#: ../thunar/thunar-preferences-dialog.c:581
+#: ../thunar/thunar-preferences-dialog.c:574
msgid "Ask everytime"
msgstr "æ¯æ¬¡éƒ½å•"
-#: ../thunar/thunar-preferences-dialog.c:582
+#: ../thunar/thunar-preferences-dialog.c:575
msgid "Apply to Folder Only"
msgstr "åªå¥—用到資料夾本身"
-#: ../thunar/thunar-preferences-dialog.c:583
+#: ../thunar/thunar-preferences-dialog.c:576
msgid "Apply to Folder and Contents"
msgstr "套用到資料夾åŠåŒ…å«å…§å®¹"
-#: ../thunar/thunar-progress-dialog.c:523
+#: ../thunar/thunar-progress-dialog.c:374
#, c-format
msgid "(%lu hour remaining)"
msgid_plural "(%lu hours remaining)"
msgstr[0] "(剩餘%lu å°æ™‚)"
-#: ../thunar/thunar-progress-dialog.c:528
+#: ../thunar/thunar-progress-dialog.c:379
#, c-format
msgid "(%lu minute remaining)"
msgid_plural "(%lu minutes remaining)"
msgstr[0] "(剩下%lu·分é˜)"
-#: ../thunar/thunar-progress-dialog.c:533
+#: ../thunar/thunar-progress-dialog.c:384
#, c-format
msgid "(%lu second remaining)"
msgid_plural "(%lu seconds remaining)"
msgstr[0] "(剩下 %lu 秒)"
-#: ../thunar/thunar-properties-dialog.c:245
+#: ../thunar/thunar-properties-dialog.c:248
msgid "General"
msgstr "一般"
-#: ../thunar/thunar-properties-dialog.c:264
+#: ../thunar/thunar-properties-dialog.c:267
msgid "Name:"
msgstr "å稱:"
#.
#. Second box (kind, open with, link target)
#.
-#: ../thunar/thunar-properties-dialog.c:289
+#: ../thunar/thunar-properties-dialog.c:292
msgid "Kind:"
msgstr "é¡žåž‹:"
-#: ../thunar/thunar-properties-dialog.c:304
+#: ../thunar/thunar-properties-dialog.c:307
msgid "Open With:"
msgstr "開啟程å¼:"
-#: ../thunar/thunar-properties-dialog.c:318
+#: ../thunar/thunar-properties-dialog.c:321
msgid "Link Target:"
msgstr "連çµç›®æ¨™:"
#.
-#. Third box (modified, accessed)
+#. Third box (deleted, modified, accessed)
#.
-#: ../thunar/thunar-properties-dialog.c:343
+#: ../thunar/thunar-properties-dialog.c:364
+#, fuzzy
+msgid "Deleted:"
+msgstr "刪除(_D)"
+
+#: ../thunar/thunar-properties-dialog.c:378
msgid "Modified:"
msgstr "變更:"
-#: ../thunar/thunar-properties-dialog.c:357
+#: ../thunar/thunar-properties-dialog.c:392
msgid "Accessed:"
msgstr "å˜å–:"
#.
#. Fourth box (size, volume, free space)
#.
-#: ../thunar/thunar-properties-dialog.c:382
+#: ../thunar/thunar-properties-dialog.c:417
msgid "Size:"
msgstr "大å°:"
-#: ../thunar/thunar-properties-dialog.c:395
+#: ../thunar/thunar-properties-dialog.c:430
msgid "Volume:"
msgstr "è£ç½®:"
-#: ../thunar/thunar-properties-dialog.c:419
+#: ../thunar/thunar-properties-dialog.c:454
msgid "Free Space:"
msgstr "å¯ç”¨ç©ºé–“:"
#.
#. Emblem chooser
#.
-#: ../thunar/thunar-properties-dialog.c:444
+#: ../thunar/thunar-properties-dialog.c:479
msgid "Emblems"
msgstr "標記"
#. update the properties dialog title
-#: ../thunar/thunar-properties-dialog.c:687
+#: ../thunar/thunar-properties-dialog.c:722
#, c-format
msgid "%s - Properties"
msgstr "%s - 內容資訊"
#. display an error message
-#: ../thunar/thunar-properties-dialog.c:842
-#: ../thunar/thunar-standard-view.c:2302
+#: ../thunar/thunar-properties-dialog.c:905
+#: ../thunar/thunar-standard-view.c:2248
#, c-format
msgid "Failed to rename \"%s\""
msgstr "無法é‡æ–°å‘½å \"%s\""
-#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-window.c:252
+#: ../thunar/thunar-renamer-dialog.c:171 ../thunar/thunar-window.c:252
msgid "_File"
msgstr "檔案(_F)"
-#: ../thunar/thunar-renamer-dialog.c:174 ../thunar/thunar-window.c:254
+#: ../thunar/thunar-renamer-dialog.c:172 ../thunar/thunar-window.c:254
msgid "_Send To"
msgstr "寄到(_S)"
-#: ../thunar/thunar-renamer-dialog.c:175 ../thunar/thunar-standard-view.c:310
+#: ../thunar/thunar-renamer-dialog.c:173 ../thunar/thunar-standard-view.c:313
msgid "File Context Menu"
msgstr "檔案å³éµé¸å–®"
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "_Add Files..."
msgstr "åŠ å…¥æª”æ¡ˆ(_A)..."
-#: ../thunar/thunar-renamer-dialog.c:176
+#: ../thunar/thunar-renamer-dialog.c:174
msgid "Include additional files in the list of files to be renamed"
msgstr "在è¦é‡æ–°å‘½å的檔案清單ä¸å†åŠ 入其他的檔案"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear"
msgstr "清除"
-#: ../thunar/thunar-renamer-dialog.c:178
+#: ../thunar/thunar-renamer-dialog.c:176
msgid "Clear the file list below"
msgstr "清除底下列出的檔案"
-#: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-window.c:273
+#: ../thunar/thunar-renamer-dialog.c:177 ../thunar/thunar-window.c:273
msgid "_About"
msgstr "關於(_A)"
-#: ../thunar/thunar-renamer-dialog.c:179
+#: ../thunar/thunar-renamer-dialog.c:177
msgid "Display information about Thunar Bulk Rename"
msgstr "顯示 Thunar 批次é‡æ–°å‘½å工具的資訊"
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "_Properties..."
msgstr "內容(_P)..."
-#: ../thunar/thunar-renamer-dialog.c:180 ../thunar/thunar-standard-view.c:313
+#: ../thunar/thunar-renamer-dialog.c:178 ../thunar/thunar-standard-view.c:316
msgid "View the properties of the selected file"
msgstr "檢視所é¸æª”案的內容資訊"
-#: ../thunar/thunar-renamer-dialog.c:365
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:359
+#: ../thunar/thunar-renamer-dialog.c:1701
#: ../Thunar-bulk-rename.desktop.in.in.h:2
msgid "Rename Multiple Files"
msgstr "é‡æ–°å‘½å多個檔案"
#. add the "Rename Files" button
-#: ../thunar/thunar-renamer-dialog.c:373
+#: ../thunar/thunar-renamer-dialog.c:367
msgid "_Rename Files"
msgstr "é‡æ–°å‘½å(_R)"
-#: ../thunar/thunar-renamer-dialog.c:376
+#: ../thunar/thunar-renamer-dialog.c:370
msgid ""
"Click here to actually rename the files listed above to their new names."
msgstr "點é¸é€™è£¡ä»¥ä¾¿å°‡ä¸Šé¢åˆ—出來的檔案轉æ›ç‚ºæ–°çš„檔å。"
-#: ../thunar/thunar-renamer-dialog.c:448
+#: ../thunar/thunar-renamer-dialog.c:442
msgid "New Name"
msgstr "æ–°å稱"
-#: ../thunar/thunar-renamer-dialog.c:513
+#: ../thunar/thunar-renamer-dialog.c:507
msgid "Click here to view the documentation for the selected rename operation."
msgstr "點é¸é€™è£¡å¸ç¿’如何é‡æ–°å‘½å所é¸çš„檔案。"
#. TRANSLATORS: You can test this string by temporarily removing thunar-sbr.* from $libdir/thunarx-1/,
#. * and opening the multi rename dialog by selecting multiple files and pressing F2.
#.
-#: ../thunar/thunar-renamer-dialog.c:621
+#: ../thunar/thunar-renamer-dialog.c:615
msgid ""
"No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
@@ -1752,30 +1813,30 @@ msgstr ""
"程å¼ï¼Œè«‹ç¢ºå®šæœ‰åŠ 入·\"Simple·Builtin·Renamers\"·這個外掛。"
#. allocate the file chooser
-#: ../thunar/thunar-renamer-dialog.c:1092
+#: ../thunar/thunar-renamer-dialog.c:1083
msgid "Select files to rename"
msgstr "é¸æ“‡è¦é‡æ–°å‘½å的檔案"
-#: ../thunar/thunar-renamer-dialog.c:1108
+#: ../thunar/thunar-renamer-dialog.c:1099
msgid "Audio Files"
msgstr "音效檔"
-#: ../thunar/thunar-renamer-dialog.c:1113
+#: ../thunar/thunar-renamer-dialog.c:1104
#: ../plugins/thunar-uca/thunar-uca-editor.c:659
msgid "Image Files"
msgstr "圖片檔"
-#: ../thunar/thunar-renamer-dialog.c:1118
+#: ../thunar/thunar-renamer-dialog.c:1109
msgid "Video Files"
msgstr "影片檔"
#. just popup the about dialog
-#: ../thunar/thunar-renamer-dialog.c:1248
+#: ../thunar/thunar-renamer-dialog.c:1239
#: ../Thunar-bulk-rename.desktop.in.in.h:1
msgid "Bulk Rename"
msgstr "批次é‡æ–°å‘½å"
-#: ../thunar/thunar-renamer-dialog.c:1249
+#: ../thunar/thunar-renamer-dialog.c:1240
msgid ""
"Thunar Bulk Rename is a powerful and extensible\n"
"tool to rename multiple files at once."
@@ -1783,19 +1844,19 @@ msgstr ""
"Thunar·é‡æ–°å‘½å本身的實用性和延展性讓您å¯ä»¥\n"
"一次就å°å¤šå€‹æª”案åšå¥½é‡æ–°å‘½å的動作。"
-#: ../thunar/thunar-renamer-dialog.c:1557
+#: ../thunar/thunar-renamer-dialog.c:1548
msgid "Remove File"
msgid_plural "Remove Files"
msgstr[0] "移除檔案"
-#: ../thunar/thunar-renamer-dialog.c:1559
+#: ../thunar/thunar-renamer-dialog.c:1550
msgid "Remove the selected file from the list of files to be renamed"
msgid_plural "Remove the selected files from the list of files to be renamed"
msgstr[0] "將所é¸çš„檔案從é‡æ–°å‘½å檔案清單ä¸æŽ’除"
msgstr[1] "將所é¸çš„檔案從é‡æ–°å‘½å檔案清單ä¸æŽ’除"
#. change title to reflect the standalone status
-#: ../thunar/thunar-renamer-dialog.c:1710
+#: ../thunar/thunar-renamer-dialog.c:1701
msgid "Bulk Rename - Rename Multiple Files"
msgstr "批次é‡æ–°å‘½å·-·å¯é‡æ–°å‘½å多個檔案"
@@ -1839,263 +1900,251 @@ msgid_plural "Add the selected folders to the shortcuts side pane"
msgstr[0] "å°‡é¸å–çš„è³‡æ–™å¤¾åŠ å…¥é‚Šæ¬„çš„æ·å¾‘å€ä¸"
#. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:1040
+#: ../thunar/thunar-shortcuts-view.c:820 ../thunar/thunar-tree-view.c:1041
msgid "_Mount Volume"
msgstr "掛載è£ç½®(_M)"
#. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:1050
+#: ../thunar/thunar-shortcuts-view.c:830 ../thunar/thunar-tree-view.c:1051
msgid "E_ject Volume"
msgstr "退出è£ç½®(_J)"
#. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1059
+#: ../thunar/thunar-shortcuts-view.c:839 ../thunar/thunar-tree-view.c:1060
msgid "_Unmount Volume"
msgstr "å¸è¼‰è£ç½®(_U)"
#. append the remove menu item
-#: ../thunar/thunar-shortcuts-view.c:852
+#: ../thunar/thunar-shortcuts-view.c:867
msgid "_Remove Shortcut"
msgstr "移除æ·å¾‘(_R)"
#. append the rename menu item
-#: ../thunar/thunar-shortcuts-view.c:867
+#: ../thunar/thunar-shortcuts-view.c:882
msgid "Re_name Shortcut"
msgstr "é‡æ–°å‘½åæ·å¾‘(_N)"
-#: ../thunar/thunar-shortcuts-view.c:1140
+#: ../thunar/thunar-shortcuts-view.c:1155
#, c-format
msgid "The path \"%s\" does not refer to a directory"
msgstr "æ¤è·¯å¾‘è¨å®šÂ·\"%s\"·並未指å‘æ£ç¢ºçš„目錄"
#. display an error message to the user
-#: ../thunar/thunar-shortcuts-view.c:1159
+#: ../thunar/thunar-shortcuts-view.c:1174
msgid "Failed to add new shortcut"
msgstr "無法建立新æ·å¾‘"
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1560
+#: ../thunar/thunar-shortcuts-view.c:1292 ../thunar/thunar-tree-view.c:1555
#, c-format
msgid "Failed to eject \"%s\""
msgstr "無法退出·\"%s\""
#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:948
-#: ../thunar/thunar-tree-view.c:1596
+#: ../thunar/thunar-shortcuts-view.c:1338 ../thunar/thunar-tree-view.c:949
+#: ../thunar/thunar-tree-view.c:1606
#, c-format
msgid "Failed to mount \"%s\""
msgstr "無法掛載·\"%s\""
#. display an error dialog to inform the user
#. display an error dialog
-#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1736
+#: ../thunar/thunar-shortcuts-view.c:1382 ../thunar/thunar-tree-view.c:1746
#, c-format
msgid "Failed to unmount \"%s\""
msgstr "無法å¸è¼‰Â·\"%s\""
-#: ../thunar/thunar-size-label.c:182
+#: ../thunar/thunar-size-label.c:176
msgid "Click here to stop calculating the total size of the folder."
msgstr "按下這裡以åœæ¢è¨ˆç®—資料夾容é‡å¤§å°"
#. tell the user that the operation was canceled
-#: ../thunar/thunar-size-label.c:306
+#: ../thunar/thunar-size-label.c:297
msgid "Calculation aborted"
msgstr "計算éŽç¨‹ä¸æ–·"
#. tell the user that we started calculation
-#: ../thunar/thunar-size-label.c:413
+#: ../thunar/thunar-size-label.c:404
msgid "Calculating..."
msgstr "計算ä¸..."
-#: ../thunar/thunar-size-label.c:423
+#: ../thunar/thunar-size-label.c:414
#, c-format
msgid "%s Bytes"
msgstr "%s·Bytes"
-#: ../thunar/thunar-size-label.c:515
+#: ../thunar/thunar-size-label.c:506
#, c-format
msgid "%u item, totalling %s"
msgid_plural "%u items, totalling %s"
msgstr[0] "%u é …ç›®ï¼Œç¸½å…± %s"
-#: ../thunar/thunar-standard-view.c:311
+#: ../thunar/thunar-standard-view.c:314
msgid "Folder Context Menu"
msgstr "資料夾å³éµé¸å–®"
-#: ../thunar/thunar-standard-view.c:312
+#: ../thunar/thunar-standard-view.c:315
msgid "Create an empty folder within the current folder"
msgstr "在目å‰çš„資料夾ä¸å»ºç«‹ä¸€å€‹ç©ºç™½çš„資料夾"
#. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:314 ../thunar/thunar-tree-view.c:1093
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1112
msgid "Cu_t"
msgstr "剪下(_T)"
#. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:315 ../thunar/thunar-tree-view.c:1105
+#: ../thunar/thunar-standard-view.c:318 ../thunar/thunar-tree-view.c:1124
msgid "_Copy"
msgstr "複製(_C)"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "_Paste"
msgstr "貼上(_P)"
-#: ../thunar/thunar-standard-view.c:316
+#: ../thunar/thunar-standard-view.c:319
msgid "Move or copy files previously selected by a Cut or Copy command"
msgstr "將之å‰å‰ªä¸‹æˆ–複製的檔案ç¾åœ¨ç§»å‹•æˆ–複製到"
#. append the "Delete" menu action
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-tree-view.c:1140
+#: ../thunar/thunar-standard-view.c:320 ../thunar/thunar-tree-view.c:1159
msgid "_Delete"
msgstr "刪除(_D)"
-#: ../thunar/thunar-standard-view.c:318
+#: ../thunar/thunar-standard-view.c:321
msgid ""
"Move or copy files previously selected by a Cut or Copy command into the "
"selected folder"
msgstr "將之å‰å‰ªä¸‹æˆ–複製的檔案ç¾åœ¨è²¼ä¸Šæˆ–複製到目å‰çš„資料夾"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select _all Files"
msgstr "é¸å–所有檔案(_A)"
-#: ../thunar/thunar-standard-view.c:319
+#: ../thunar/thunar-standard-view.c:322
msgid "Select all files in this window"
msgstr "é¸å–在æ¤è¦–窗ä¸æ‰€æœ‰æª”案"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select _by Pattern..."
msgstr "ä¾é—œéµå—é¸å–(_B)"
-#: ../thunar/thunar-standard-view.c:320
+#: ../thunar/thunar-standard-view.c:323
msgid "Select all files that match a certain pattern"
msgstr "é¸å–所有符åˆé—œéµå—的檔案"
-#: ../thunar/thunar-standard-view.c:321
+#: ../thunar/thunar-standard-view.c:324
msgid "Du_plicate"
msgstr "翻製檔案(_P)"
-#: ../thunar/thunar-standard-view.c:322 ../thunar/thunar-standard-view.c:3395
+#: ../thunar/thunar-standard-view.c:325 ../thunar/thunar-standard-view.c:3370
msgid "Ma_ke Link"
msgid_plural "Ma_ke Links"
msgstr[0] "建立連çµ(_K)"
-#: ../thunar/thunar-standard-view.c:323
+#: ../thunar/thunar-standard-view.c:326
msgid "_Rename..."
msgstr "é‡æ–°å‘½å(_R)..."
-#: ../thunar/thunar-standard-view.c:323
-msgid "Rename the selected file"
-msgstr "é‡æ–°å‘½å所é¸çš„檔案"
+#: ../thunar/thunar-standard-view.c:327
+msgid "_Restore"
+msgstr ""
#. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:582
+#: ../thunar/thunar-standard-view.c:587
msgid "Create _Document"
msgstr "建立新文件(_D)"
-#: ../thunar/thunar-standard-view.c:1243
+#: ../thunar/thunar-standard-view.c:1262
msgid "Loading folder contents..."
msgstr "æ£åœ¨è¼‰å…¥è³‡æ–™å¤¾å…§å®¹..."
#. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File"
msgstr "新建空白文件"
-#: ../thunar/thunar-standard-view.c:1739
+#: ../thunar/thunar-standard-view.c:1733
msgid "New Empty File..."
msgstr "新建空白文件..."
#. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1839
+#: ../thunar/thunar-standard-view.c:1833
#, c-format
msgid "Create Document from template \"%s\""
msgstr "從模æ¿Â·\"%s\" ä¸å»ºç«‹æ–°çš„文件"
-#: ../thunar/thunar-standard-view.c:1990 ../thunar/thunar-tree-view.c:1510
-#, c-format
-msgid ""
-"Are you sure that you want to\n"
-"permanently delete \"%s\"?"
-msgstr ""
-"您確定è¦å¾¹åº•åˆªé™¤\n"
-"所é¸çš„檔案·\"%s\"?"
-
-#: ../thunar/thunar-standard-view.c:1995
-#, c-format
-msgid ""
-"Are you sure that you want to permanently\n"
-"delete the selected file?"
-msgid_plural ""
-"Are you sure that you want to permanently\n"
-"delete the %u selected files?"
-msgstr[0] ""
-"您確定è¦å¾¹åº•åˆªé™¤\n"
-"所é¸çš„檔案嗎？"
-
-#: ../thunar/thunar-standard-view.c:2017 ../thunar/thunar-tree-view.c:1517
-msgid "If you delete a file, it is permanently lost."
-msgstr "如果您刪除了檔案，將å†ä¹Ÿæ‰¾ä¸å›žä¾†ã€‚"
-
-#: ../thunar/thunar-standard-view.c:2082
+#: ../thunar/thunar-standard-view.c:2028
msgid "Select by Pattern"
msgstr "ä¾é—œéµå—é¸å–"
-#: ../thunar/thunar-standard-view.c:2088
+#: ../thunar/thunar-standard-view.c:2034
msgid "_Select"
msgstr "é¸å–(_S)"
-#: ../thunar/thunar-standard-view.c:2097
+#: ../thunar/thunar-standard-view.c:2043
msgid "_Pattern:"
msgstr "é—œéµå—(_P):"
#. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2231
+#: ../thunar/thunar-standard-view.c:2177
#, c-format
msgid "Rename \"%s\""
msgstr "é‡æ–°å‘½å·\"%s\""
#. tell the user that the file name provided by the X Direct Save source is invalid
-#: ../thunar/thunar-standard-view.c:2570
+#: ../thunar/thunar-standard-view.c:2534
msgid "Invalid filename provided by XDS drag site"
msgstr "ç”± XDS 拖曳所æ供的檔å無效"
#. display an error dialog to the user
-#: ../thunar/thunar-standard-view.c:2747
+#: ../thunar/thunar-standard-view.c:2711
#, c-format
msgid "Failed to create a link for the URL \"%s\""
msgstr "無法為URL \"%s\" 建立連çµ"
-#: ../thunar/thunar-standard-view.c:3010
+#: ../thunar/thunar-standard-view.c:2974
#, c-format
msgid "Failed to open directory \"%s\""
msgstr "無法開啟目錄·\"%s\""
-#: ../thunar/thunar-standard-view.c:3355
+#: ../thunar/thunar-standard-view.c:3330
msgid "Prepare the selected file to be moved with a Paste command"
msgid_plural "Prepare the selected files to be moved with a Paste command"
msgstr[0] "準備將é¸å–的檔案以貼上指令移動"
-#: ../thunar/thunar-standard-view.c:3363
+#: ../thunar/thunar-standard-view.c:3338
msgid "Prepare the selected file to be copied with a Paste command"
msgid_plural "Prepare the selected files to be copied with a Paste command"
msgstr[0] "準備所é¸çš„檔案將被複製到緩è¡å€ä»¥ä¾¿æ–¼è²¼ä¸Š"
-#: ../thunar/thunar-standard-view.c:3374
-msgid "Delete the selected file permanently"
-msgid_plural "Delete the selected files permanently"
-msgstr[0] "永久刪除所é¸çš„檔案"
+#: ../thunar/thunar-standard-view.c:3349
+#, fuzzy
+msgid "Delete the selected file"
+msgid_plural "Delete the selected files"
+msgstr[0] "é‡è£½æ‰€é¸æª”案"
-#: ../thunar/thunar-standard-view.c:3388
+#: ../thunar/thunar-standard-view.c:3363
msgid "Duplicate the selected file"
msgid_plural "Duplicate each selected file"
msgstr[0] "é‡è£½æ‰€é¸æª”案"
-#: ../thunar/thunar-standard-view.c:3397
+#: ../thunar/thunar-standard-view.c:3372
msgid "Create a symbolic link for the selected file"
msgid_plural "Create a symbolic link for each selected file"
msgstr[0] "為所é¸çš„檔案建立符號連çµ"
+#: ../thunar/thunar-standard-view.c:3380
+#, fuzzy
+msgid "Rename the selected file"
+msgid_plural "Rename the selected files"
+msgstr[0] "é‡æ–°å‘½å所é¸çš„檔案"
+
+#: ../thunar/thunar-standard-view.c:3388
+#, fuzzy
+msgid "Restore the selected file"
+msgid_plural "Restore the selected files"
+msgstr[0] "é‡æ–°å‘½å所é¸çš„檔案"
+
#: ../thunar/thunar-stock.c:57
msgid "Create"
msgstr "建立"
@@ -2114,20 +2163,30 @@ msgstr "沒有安è£ä»»ä½•æ¨¡æ¿"
msgid "_Empty File"
msgstr "空白文件(_E)"
-#: ../thunar/thunar-tree-model.c:600
+#: ../thunar/thunar-tree-model.c:592
msgid "Loading..."
msgstr "載入ä¸..."
#. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-tree-view.c:1122
+#: ../thunar/thunar-tree-view.c:1141
msgid "_Paste Into Folder"
msgstr "貼到資料夾ä¸(_P)"
#. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:1163
+#: ../thunar/thunar-tree-view.c:1182
msgid "P_roperties..."
msgstr "è¨å®šé¸é …(_P)..."
+#. TRANSLATORS: file was modified less than one day ago
+#: ../thunar/thunar-util.c:89
+msgid "Today"
+msgstr ""
+
+#. TRANSLATORS: file was modified less than two days ago
+#: ../thunar/thunar-util.c:94
+msgid "Yesterday"
+msgstr ""
+
#: ../thunar/thunar-window.c:253
msgid "Open New _Window"
msgstr "開啟新視窗(_W)"
@@ -2548,26 +2607,25 @@ msgid "Shutter Speed:"
msgstr "快門速度："
#: ../plugins/thunar-apr/thunar-apr-image-page.c:59
+msgid "ISO Speed Ratings:"
+msgstr ""
+
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:60
msgid "Software:"
msgstr "軟體:"
#
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:115
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:116
msgid "Image"
msgstr "圖片檔"
#
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:130
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:131
msgid "Image Type:"
msgstr "圖片類型:"
-#
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:150
-msgid "Image Size:"
-msgstr "圖片大å°:"
-
#. update the "Image Size" label
-#: ../plugins/thunar-apr/thunar-apr-image-page.c:244
+#: ../plugins/thunar-apr/thunar-apr-image-page.c:245
#, c-format
msgid "%dx%d pixel"
msgid_plural "%dx%d pixels"
@@ -2742,21 +2800,21 @@ msgstr "用錯常è¦è¡¨ç¤ºæ³•ï¼Œå‡ºéŒ¯çš„å—元是在·%ld:·%s"
msgid "Search & Replace"
msgstr "æœå°‹ä¸¦å–代"
-#: ../plugins/thunar-sendto-email/main.c:174
+#: ../plugins/thunar-sendto-email/main.c:173
#, c-format
msgid "Send \"%s\" as compressed archive?"
msgstr "以壓縮åˆä½µæ–¹å¼å¯„é€ \"%s\"？"
-#: ../plugins/thunar-sendto-email/main.c:176
-#: ../plugins/thunar-sendto-email/main.c:195
+#: ../plugins/thunar-sendto-email/main.c:175
+#: ../plugins/thunar-sendto-email/main.c:194
msgid "Send _directly"
msgstr "直接寄出(_D)"
-#: ../plugins/thunar-sendto-email/main.c:177
+#: ../plugins/thunar-sendto-email/main.c:176
msgid "Send com_pressed"
msgstr "寄出壓縮檔(_P)"
-#: ../plugins/thunar-sendto-email/main.c:179
+#: ../plugins/thunar-sendto-email/main.c:178
msgid ""
"When sending a file via email, you can either choose to send the file "
"directly, as is, or compress the file before attaching it to an email. It is "
@@ -2765,17 +2823,17 @@ msgstr ""
"以電å郵件郵寄檔案時，您å¯ä»¥é¸æ“‡ç›´æŽ¥å¯„é€åŽŸæœ¬çš„æª”æ¡ˆï¼Œæˆ–æ˜¯åœ¨é™„åŠ åˆ°éƒµä»¶ä¹‹å‰å…ˆäºˆ"
"以壓縮。強烈建è°ï¼šå¯„é€å¤§åž‹æª”案之å‰å…ˆå°‡å…¶å£“縮。"
-#: ../plugins/thunar-sendto-email/main.c:190
+#: ../plugins/thunar-sendto-email/main.c:189
#, c-format
msgid "Send %d file as compressed archive?"
msgid_plural "Send %d files as compressed archive?"
msgstr[0] "以壓縮åˆä½µæ–¹å¼å¯„é€ %d 個檔案？"
-#: ../plugins/thunar-sendto-email/main.c:196
+#: ../plugins/thunar-sendto-email/main.c:195
msgid "Send as _archive"
msgstr "以åˆä½µæª”寄出(_A)"
-#: ../plugins/thunar-sendto-email/main.c:198
+#: ../plugins/thunar-sendto-email/main.c:197
msgid ""
"When sending multiple files via email, you can either choose to send the "
"files directly, attaching multiple files to an email, or send all files "
@@ -2788,35 +2846,35 @@ msgstr ""
#. allocate the progress dialog
#. setup the label
-#: ../plugins/thunar-sendto-email/main.c:247
-#: ../plugins/thunar-sendto-email/main.c:272
+#: ../plugins/thunar-sendto-email/main.c:246
+#: ../plugins/thunar-sendto-email/main.c:271
msgid "Compressing files..."
msgstr "壓縮檔案ä¸..."
#. tell the user that the command failed
-#: ../plugins/thunar-sendto-email/main.c:297
+#: ../plugins/thunar-sendto-email/main.c:296
#, c-format
msgid "ZIP command terminated with error %d"
msgstr "ZIP 指令終çµï¼ŒéŒ¯èª¤ï¼š%d"
-#: ../plugins/thunar-sendto-email/main.c:344
+#: ../plugins/thunar-sendto-email/main.c:343
msgid "Failed to create temporary directory"
msgstr "無法建立暫時目錄"
-#: ../plugins/thunar-sendto-email/main.c:395
+#: ../plugins/thunar-sendto-email/main.c:394
#, c-format
msgid "Failed to create symbolic link for \"%s\""
msgstr "無法為 \"%s\" 建立符號連çµ"
#. tell the user that we failed to compress the file(s)
-#: ../plugins/thunar-sendto-email/main.c:418
+#: ../plugins/thunar-sendto-email/main.c:417
#, c-format
msgid "Failed to compress %d file"
msgid_plural "Failed to compress %d files"
msgstr[0] "無法壓縮 %d 個檔案"
#. tell the user that we failed
-#: ../plugins/thunar-sendto-email/main.c:559
+#: ../plugins/thunar-sendto-email/main.c:558
msgid "Failed to compose new email"
msgstr "無法編寫新郵件"
@@ -2824,6 +2882,33 @@ msgstr "無法編寫新郵件"
msgid "Mail Recipient"
msgstr "郵件收據"
+#. tell the user that we failed to connect to the trash
+#. display an error message to the user
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:272
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:317
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:346
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:380
+#, fuzzy
+msgid "Failed to connect to the Trash"
+msgstr "無法連çµè‡³Â·HAL·æœå‹™:·%s"
+
+#. tell the user whether the trash is full or empty
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is full"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa-icon.c:287
+msgid "Trash is empty"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:1
+msgid "Display the trash can"
+msgstr ""
+
+#: ../plugins/thunar-tpa/thunar-tpa.desktop.in.in.h:2
+msgid "Trash Applet"
+msgstr ""
+
#: ../plugins/thunar-uca/thunar-uca-chooser.c:125
msgid "Custom Actions"
msgstr "自訂動作"
@@ -3056,11 +3141,11 @@ msgstr "使用 root權é™æ™‚åœæ¢ç‹€æ…‹è™•ç†å…ƒè¢«å‘¼å«äº†"
msgid "Unknown closing element <%s>"
msgstr "未知的æ„外關閉·<%s>"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1311
+#: ../plugins/thunar-uca/thunar-uca-model.c:1318
msgid "Failed to determine save location for uca.xml"
msgstr "無法åµæ¸¬å„²å˜Â·uca.xml 的檔案ä½ç½®"
-#: ../plugins/thunar-uca/thunar-uca-model.c:1426
+#: ../plugins/thunar-uca/thunar-uca-model.c:1433
msgid "Command not configured"
msgstr "未è¨å®šå¥½æŒ‡ä»¤"
@@ -3109,3 +3194,85 @@ msgstr "以 Thunar 開啟資料夾"
#: ../Thunar-folder-handler.desktop.in.in.h:3
msgid "Open the specified folders in Thunar"
msgstr "在·Thunarä¸é–‹å•ŸæŒ‡å®šçš„資料夾"
+
+#~ msgid "Delete the selected file permanently"
+#~ msgid_plural "Delete the selected files permanently"
+#~ msgstr[0] "永久刪除所é¸çš„檔案"
+
+#, fuzzy
+#~ msgid "Failed to change permisions of \"%s\""
+#~ msgstr "無法更改 \"%s\" 的權é™è¨å®šï¼š %s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "您想è¦ç•¥éŽå—Žï¼Ÿ"
+
+#~ msgid "Failed to determine file info of \"%s\": %s"
+#~ msgstr "無法決定 \"%s\" 的檔案資訊：%s"
+
+#~ msgid ""
+#~ "The file \"%s\" already exists. Do you want to replace it with an empty "
+#~ "file?"
+#~ msgstr "檔案 \"%s\" 已經å˜åœ¨ã€‚您想è¦ç”¨ä¸€å€‹ç©ºæª”案å–而代之嗎？"
+
+#~ msgid ""
+#~ "Failed to remove \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "無法移除 \"%s\".\n"
+#~ "\n"
+#~ "您想è¦è·³éŽå—Žï¼Ÿ"
+
+#~ msgid ""
+#~ "Failed to create empty file \"%s\".\n"
+#~ "\n"
+#~ "Do you want to skip it?"
+#~ msgstr ""
+#~ "無法建立空檔案 \"%s\".\n"
+#~ "\n"
+#~ "您想è¦è·³éŽå—Žï¼Ÿ"
+
+#~ msgid "Failed to stat file \"%s\": %s"
+#~ msgstr "無法安置檔案 \"%s\"：%s"
+
+#~ msgid ""
+#~ "%s.\n"
+#~ "\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s.\n"
+#~ "\n"
+#~ "您想è¦è¦†è“‹å®ƒå—Žï¼Ÿ"
+
+#~ msgid "Failed to create directory \"%s\": %s"
+#~ msgstr "無法建立目錄 \"%s\"：%s"
+
+#~ msgid "Deleting directories..."
+#~ msgstr "刪除目錄ä¸..."
+
+#~ msgid "Failed to remove directory \"%s\": %s"
+#~ msgstr "無法移除目錄 \"%s\"：%s"
+
+#~ msgid "Cannot transfer the root directory"
+#~ msgstr "ç„¡æ³•è½‰ç§»æ ¹ç›®éŒ„"
+
+#~ msgid "Named pipes are not supported"
+#~ msgstr "尚未支æ´å稱管線"
+
+#~ msgid "Operation canceled"
+#~ msgstr "æ“作å–消"
+
+#~ msgid "Failed to read link target from \"%s\""
+#~ msgstr "無法讀å–連çµç›®æ¨™ \"%s\""
+
+#~ msgid "Failed to change mode of \"%s\""
+#~ msgstr "無法更改 \"%s\" 的模å¼"
+
+#~ msgid "Failed to copy special file \"%s\""
+#~ msgstr "無法複製特殊檔案 \"%s\""
diff --git a/thunar-vfs/Makefile.am b/thunar-vfs/Makefile.am
index 7573f06a6ce9b8fbfe67e036795d7d518e124da2..fba14a7f81f39b60e1dc1cde3a8eb90c9f2c5645 100644
--- a/thunar-vfs/Makefile.am
+++ b/thunar-vfs/Makefile.am
@@ -32,6 +32,30 @@ libthunar_vfs_headers = \
thunar-vfs-util.h \
thunar-vfs-volume.h
+libthunar_vfs_io_sources = \
+ thunar-vfs-io-jobs.c \
+ thunar-vfs-io-jobs.h \
+ thunar-vfs-io-local.c \
+ thunar-vfs-io-local.h \
+ thunar-vfs-io-local-xfer.c \
+ thunar-vfs-io-local-xfer.h \
+ thunar-vfs-io-ops.c \
+ thunar-vfs-io-ops.h \
+ thunar-vfs-io-scandir.c \
+ thunar-vfs-io-scandir.h \
+ thunar-vfs-io-trash.c \
+ thunar-vfs-io-trash.h
+
+libthunar_vfs_os_sources = \
+ thunar-vfs-os.h
+if THUNAR_VFS_OS_IMPL_BSD
+libthunar_vfs_os_sources += \
+ thunar-vfs-os-bsd.c
+else
+libthunar_vfs_os_sources += \
+ thunar-vfs-os-generic.c
+endif
+
libthunar_vfs_public_built_sources = \
thunar-vfs-enum-types.h
@@ -53,14 +77,10 @@ libthunar_vfs_include_HEADERS = \
libthunar_vfs_1_la_SOURCES = \
$(libthunar_vfs_volume_impl_sources) \
$(libthunar_vfs_built_sources) \
+ $(libthunar_vfs_io_sources) \
+ $(libthunar_vfs_os_sources) \
$(libthunar_vfs_headers) \
- thunar-vfs-chmod-job.c \
- thunar-vfs-chmod-job.h \
- thunar-vfs-chown-job.c \
- thunar-vfs-chown-job.h \
thunar-vfs-config.c \
- thunar-vfs-creat-job.c \
- thunar-vfs-creat-job.h \
thunar-vfs-deep-count-job.c \
thunar-vfs-deep-count-job.h \
thunar-vfs-exec.c \
@@ -68,16 +88,14 @@ libthunar_vfs_1_la_SOURCES = \
thunar-vfs-info.c \
thunar-vfs-interactive-job.c \
thunar-vfs-job.c \
- thunar-vfs-link-job.c \
- thunar-vfs-link-job.h \
- thunar-vfs-listdir-job.c \
- thunar-vfs-listdir-job.h \
+ thunar-vfs-job-private.h \
thunar-vfs-mime-action-private.h \
thunar-vfs-mime-action.c \
thunar-vfs-mime-application.c \
thunar-vfs-mime-cache.c \
thunar-vfs-mime-cache.h \
thunar-vfs-mime-database.c \
+ thunar-vfs-mime-database-private.h \
thunar-vfs-mime-handler-private.h \
thunar-vfs-mime-handler.c \
thunar-vfs-mime-info.c \
@@ -89,30 +107,27 @@ libthunar_vfs_1_la_SOURCES = \
thunar-vfs-mime-provider.h \
thunar-vfs-mime-sniffer.c \
thunar-vfs-mime-sniffer.h \
- thunar-vfs-mkdir-job.c \
- thunar-vfs-mkdir-job.h \
thunar-vfs-monitor.c \
+ thunar-vfs-monitor-private.h \
+ thunar-vfs-path-private.h \
thunar-vfs-path.c \
thunar-vfs-private.c \
thunar-vfs-private.h \
- thunar-vfs-scandir.c \
- thunar-vfs-scandir.h \
+ thunar-vfs-simple-job.c \
+ thunar-vfs-simple-job.h \
thunar-vfs-thumb-jpeg.c \
thunar-vfs-thumb-jpeg.h \
thunar-vfs-thumb-pixbuf.c \
thunar-vfs-thumb-pixbuf.h \
+ thunar-vfs-thumb-private.h \
thunar-vfs-thumb.c \
thunar-vfs-transfer-job.c \
thunar-vfs-transfer-job.h \
- thunar-vfs-unlink-job.c \
- thunar-vfs-unlink-job.h \
thunar-vfs-user.c \
thunar-vfs-util.c \
thunar-vfs-volume.c \
thunar-vfs-volume-manager.c \
thunar-vfs-volume-private.h \
- thunar-vfs-xfer.c \
- thunar-vfs-xfer.h \
thunar-vfs.c
libthunar_vfs_1_la_CFLAGS = \
@@ -267,7 +282,8 @@ thunar-vfs-marshal.h: stamp-thunar-vfs-marshal.h
stamp-thunar-vfs-marshal.h: thunar-vfs-marshal.list Makefile
( cd $(srcdir) && glib-genmarshal \
--prefix=_thunar_vfs_marshal \
- --header thunar-vfs-marshal.list ) >> xgen-tvmh \
+ --header thunar-vfs-marshal.list \
+ | sed -e 's/marshal_data);$$/marshal_data) G_GNUC_INTERNAL;/' ) >> xgen-tvmh \
&& ( cmp -s xgen-tvmh thunar-vfs-marshal.h || cp xgen-tvmh thunar-vfs-marshal.h ) \
&& rm -f xgen-tvmh \
&& echo timestamp > $(@F)
diff --git a/thunar-vfs/thunar-vfs-chmod-job.c b/thunar-vfs/thunar-vfs-chmod-job.c
deleted file mode 100644
index 27d53d283040da050f7ed9d617d739fad96471e1..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-chmod-job.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <thunar-vfs/thunar-vfs-chmod-job.h>
-#include <thunar-vfs/thunar-vfs-monitor.h>
-#include <thunar-vfs/thunar-vfs-private.h>
-#include <thunar-vfs/thunar-vfs-scandir.h>
-#include <thunar-vfs/thunar-vfs-alias.h>
-
-
-
-static void thunar_vfs_chmod_job_class_init (ThunarVfsChmodJobClass *klass);
-static void thunar_vfs_chmod_job_init (ThunarVfsChmodJob *chmod_job);
-static void thunar_vfs_chmod_job_finalize (GObject *object);
-static void thunar_vfs_chmod_job_execute (ThunarVfsJob *job);
-static gboolean thunar_vfs_chmod_job_operate (ThunarVfsChmodJob *chmod_job,
- ThunarVfsPath *path,
- GError **error);
-
-
-
-struct _ThunarVfsChmodJobClass
-{
- ThunarVfsInteractiveJobClass __parent__;
-};
-
-struct _ThunarVfsChmodJob
-{
- ThunarVfsInteractiveJob __parent__;
-
- ThunarVfsMonitor *monitor;
-
- ThunarVfsPath *path;
- ThunarVfsFileMode dir_mask;
- ThunarVfsFileMode dir_mode;
- ThunarVfsFileMode file_mask;
- ThunarVfsFileMode file_mode;
- gboolean recursive;
-
- guint total;
- guint completed;
-};
-
-
-
-static GObjectClass *thunar_vfs_chmod_job_parent_class;
-
-
-
-GType
-thunar_vfs_chmod_job_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_INTERACTIVE_JOB,
- "ThunarVfsChmodJob",
- sizeof (ThunarVfsChmodJobClass),
- thunar_vfs_chmod_job_class_init,
- sizeof (ThunarVfsChmodJob),
- thunar_vfs_chmod_job_init,
- 0);
- }
-
- return type;
-}
-
-
-
-static void
-thunar_vfs_chmod_job_class_init (ThunarVfsChmodJobClass *klass)
-{
- ThunarVfsJobClass *thunarvfs_job_class;
- GObjectClass *gobject_class;
-
- /* determine the parent type class */
- thunar_vfs_chmod_job_parent_class = g_type_class_peek_parent (klass);
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = thunar_vfs_chmod_job_finalize;
-
- thunarvfs_job_class = THUNAR_VFS_JOB_CLASS (klass);
- thunarvfs_job_class->execute = thunar_vfs_chmod_job_execute;
-}
-
-
-
-static void
-thunar_vfs_chmod_job_init (ThunarVfsChmodJob *chmod_job)
-{
- /* grab a reference on the VFS monitor */
- chmod_job->monitor = thunar_vfs_monitor_get_default ();
-}
-
-
-
-static void
-thunar_vfs_chmod_job_finalize (GObject *object)
-{
- ThunarVfsChmodJob *chmod_job = THUNAR_VFS_CHMOD_JOB (object);
-
- /* release the reference on the VFS monitor */
- g_object_unref (G_OBJECT (chmod_job->monitor));
-
- /* release the base path */
- thunar_vfs_path_unref (chmod_job->path);
-
- (*G_OBJECT_CLASS (thunar_vfs_chmod_job_parent_class)->finalize) (object);
-}
-
-
-
-static void
-thunar_vfs_chmod_job_execute (ThunarVfsJob *job)
-{
- ThunarVfsChmodJob *chmod_job = THUNAR_VFS_CHMOD_JOB (job);
- gboolean skip;
- gdouble percentage;
- GError *error = NULL;
- gchar *message;
- GList *path_list = NULL;
- GList *lp;
-
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (job), _("Collecting files..."));
-
- /* check if we should operate recursively and collect the paths */
- if (G_UNLIKELY (chmod_job->recursive))
- path_list = thunar_vfs_scandir (chmod_job->path, &job->cancelled, THUNAR_VFS_SCANDIR_RECURSIVE, NULL, NULL);
- path_list = thunar_vfs_path_list_prepend (path_list, chmod_job->path);
-
- /* determine the total number of paths (atleast one!) */
- chmod_job->total = g_list_length (path_list);
-
- /* process all paths */
- for (lp = path_list; !thunar_vfs_job_cancelled (job) && lp != NULL; lp = lp->next)
- {
- /* try to perform the operation */
- if (!thunar_vfs_chmod_job_operate (chmod_job, lp->data, &error))
- {
- /* no need to ask if this is the last file */
- if (G_UNLIKELY (lp->next == NULL))
- break;
-
- /* ask the user whether we should skip the file */
- message = g_strdup_printf (_("%s.\n\nDo you want to skip it?"), error->message);
- skip = thunar_vfs_interactive_job_skip (THUNAR_VFS_INTERACTIVE_JOB (job), message);
- g_clear_error (&error);
- g_free (message);
-
- /* check if we should skip */
- if (G_UNLIKELY (!skip))
- break;
- }
-
- /* we've just completed another item */
- chmod_job->completed += 1;
-
- /* update the percentage */
- percentage = (chmod_job->completed * 100.0) / chmod_job->total;
- thunar_vfs_interactive_job_percent (THUNAR_VFS_INTERACTIVE_JOB (job), CLAMP (percentage, 0.0, 100.0));
-
- /* release the path */
- thunar_vfs_path_unref (lp->data);
- }
-
- /* emit an error if some operation failed */
- if (G_UNLIKELY (error != NULL))
- {
- thunar_vfs_job_error (job, error);
- g_error_free (error);
- }
-
- /* release the (remaining) path list */
- for (; lp != NULL; lp = lp->next)
- thunar_vfs_path_unref (lp->data);
- g_list_free (path_list);
-}
-
-
-
-static gboolean
-thunar_vfs_chmod_job_operate (ThunarVfsChmodJob *chmod_job,
- ThunarVfsPath *path,
- GError **error)
-{
- const gchar *message;
- struct stat statb;
- mode_t mask;
- mode_t mode;
- gchar absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
- gchar *display_name;
-
- /* update the progress message */
- display_name = g_filename_display_name (thunar_vfs_path_get_name (path));
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (chmod_job), display_name);
- g_free (display_name);
-
- /* determine the absolute path */
- if (thunar_vfs_path_to_string (path, absolute_path, sizeof (absolute_path), error) < 0)
- return FALSE;
-
- /* try to stat the file */
- if (stat (absolute_path, &statb) < 0)
- {
- /* we just ignore ENOENT here */
- if (G_UNLIKELY (errno == ENOENT))
- return TRUE;
-
- message = _("Failed to determine file info of \"%s\": %s");
- goto error;
- }
-
- /* different actions depending on the type of the file */
- if (S_ISDIR (statb.st_mode))
- {
- mask = chmod_job->dir_mask;
- mode = chmod_job->dir_mode;
- }
- else
- {
- mask = chmod_job->file_mask;
- mode = chmod_job->file_mode;
- }
-
- /* determine the new mode */
- mode = ((statb.st_mode & ~mask) | mode) & 07777;
-
- /* try to apply the new mode */
- if (chmod (absolute_path, mode) < 0)
- {
- /* again, ignore ENOENT */
- if (G_UNLIKELY (errno == ENOENT))
- return TRUE;
-
- message = _("Failed to change permissions of \"%s\": %s");
- goto error;
- }
-
- /* feed a change notification event */
- thunar_vfs_monitor_feed (chmod_job->monitor, THUNAR_VFS_MONITOR_EVENT_CHANGED, path);
-
- /* we did it */
- return TRUE;
-
-error:
- display_name = g_filename_display_name (absolute_path);
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), message, display_name, g_strerror (errno));
- g_free (display_name);
- return FALSE;
-}
-
-
-
-/**
- * thunar_vfs_chmod_job_new:
- * @path : the base path.
- * @dir_mask : the mode mask for directories.
- * @dir_mode : the new mode for directories.
- * @file_mask : the mode mask for files.
- * @file_mode : the new mode for files.
- * @recursive : whether to operate recursively.
- * @error : return location for errors or %NULL.
- *
- * Allocates a new #ThunarVfsChmodJob instance, which is
- * used to change the mode of @path (and maybe subfiles
- * and subfolders, depending on @recursive).
- *
- * Return value: the newly allocated #ThunarVfsChmodJob.
- **/
-ThunarVfsJob*
-thunar_vfs_chmod_job_new (ThunarVfsPath *path,
- ThunarVfsFileMode dir_mask,
- ThunarVfsFileMode dir_mode,
- ThunarVfsFileMode file_mask,
- ThunarVfsFileMode file_mode,
- gboolean recursive,
- GError **error)
-{
- ThunarVfsChmodJob *chmod_job;
-
- g_return_val_if_fail (path != NULL, NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- /* allocate and initialize the new job */
- chmod_job = g_object_new (THUNAR_VFS_TYPE_CHMOD_JOB, NULL);
- chmod_job->path = thunar_vfs_path_ref (path);
- chmod_job->dir_mask = dir_mask;
- chmod_job->dir_mode = dir_mode;
- chmod_job->file_mask = file_mask;
- chmod_job->file_mode = file_mode;
- chmod_job->recursive = recursive;
-
- return THUNAR_VFS_JOB (chmod_job);
-}
-
-
-
-#define __THUNAR_VFS_TRANSFER_JOB_C__
-#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-chmod-job.h b/thunar-vfs/thunar-vfs-chmod-job.h
deleted file mode 100644
index a192bc3dfbe2e7b17987d3f6c80ee073c939dd7c..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-chmod-job.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
-#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef __THUNAR_VFS_CHMOD_JOB_H__
-#define __THUNAR_VFS_CHMOD_JOB_H__
-
-#include <thunar-vfs/thunar-vfs-interactive-job.h>
-#include <thunar-vfs/thunar-vfs-path.h>
-#include <thunar-vfs/thunar-vfs-types.h>
-
-G_BEGIN_DECLS;
-
-typedef struct _ThunarVfsChmodJobClass ThunarVfsChmodJobClass;
-typedef struct _ThunarVfsChmodJob ThunarVfsChmodJob;
-
-#define THUNAR_VFS_TYPE_CHMOD_JOB (thunar_vfs_chmod_job_get_type ())
-#define THUNAR_VFS_CHMOD_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_CHMOD_JOB, ThunarVfsChmodJob))
-#define THUNAR_VFS_CHMOD_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_CHMOD_JOB, ThunarVfsChmodJobClass))
-#define THUNAR_VFS_IS_CHMOD_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_CHMOD_JOB))
-#define THUNAR_VFS_IS_CHMOD_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_CHMOD_JOB))
-#define THUNAR_VFS_CHMOD_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_CHMOD_JOB, ThunarVfsChmodJobClass))
-
-GType thunar_vfs_chmod_job_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
-
-ThunarVfsJob *thunar_vfs_chmod_job_new (ThunarVfsPath *path,
- ThunarVfsFileMode dir_mask,
- ThunarVfsFileMode dir_mode,
- ThunarVfsFileMode file_mask,
- ThunarVfsFileMode file_mode,
- gboolean recursive,
- GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_VFS_CHMOD_JOB_H__ */
diff --git a/thunar-vfs/thunar-vfs-chown-job.c b/thunar-vfs/thunar-vfs-chown-job.c
deleted file mode 100644
index 93a019e821284d70767381405b0a8466a6d4c17e..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-chown-job.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * ownify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <thunar-vfs/thunar-vfs-chown-job.h>
-#include <thunar-vfs/thunar-vfs-monitor.h>
-#include <thunar-vfs/thunar-vfs-private.h>
-#include <thunar-vfs/thunar-vfs-scandir.h>
-#include <thunar-vfs/thunar-vfs-alias.h>
-
-
-
-static void thunar_vfs_chown_job_class_init (ThunarVfsChownJobClass *klass);
-static void thunar_vfs_chown_job_init (ThunarVfsChownJob *chown_job);
-static void thunar_vfs_chown_job_finalize (GObject *object);
-static void thunar_vfs_chown_job_execute (ThunarVfsJob *job);
-static gboolean thunar_vfs_chown_job_operate (ThunarVfsChownJob *chown_job,
- ThunarVfsPath *path,
- GError **error);
-
-
-
-struct _ThunarVfsChownJobClass
-{
- ThunarVfsInteractiveJobClass __parent__;
-};
-
-struct _ThunarVfsChownJob
-{
- ThunarVfsInteractiveJob __parent__;
-
- ThunarVfsMonitor *monitor;
-
- ThunarVfsPath *path;
- gint uid;
- gint gid;
- gboolean recursive;
-
- guint total;
- guint completed;
-};
-
-
-
-static GObjectClass *thunar_vfs_chown_job_parent_class;
-
-
-
-GType
-thunar_vfs_chown_job_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_INTERACTIVE_JOB,
- "ThunarVfsChownJob",
- sizeof (ThunarVfsChownJobClass),
- thunar_vfs_chown_job_class_init,
- sizeof (ThunarVfsChownJob),
- thunar_vfs_chown_job_init,
- 0);
- }
-
- return type;
-}
-
-
-
-static void
-thunar_vfs_chown_job_class_init (ThunarVfsChownJobClass *klass)
-{
- ThunarVfsJobClass *thunarvfs_job_class;
- GObjectClass *gobject_class;
-
- /* determine the parent type class */
- thunar_vfs_chown_job_parent_class = g_type_class_peek_parent (klass);
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = thunar_vfs_chown_job_finalize;
-
- thunarvfs_job_class = THUNAR_VFS_JOB_CLASS (klass);
- thunarvfs_job_class->execute = thunar_vfs_chown_job_execute;
-}
-
-
-
-static void
-thunar_vfs_chown_job_init (ThunarVfsChownJob *chown_job)
-{
- /* grab a reference on the VFS monitor */
- chown_job->monitor = thunar_vfs_monitor_get_default ();
-}
-
-
-
-static void
-thunar_vfs_chown_job_finalize (GObject *object)
-{
- ThunarVfsChownJob *chown_job = THUNAR_VFS_CHOWN_JOB (object);
-
- /* release the reference on the VFS monitor */
- g_object_unref (G_OBJECT (chown_job->monitor));
-
- /* release the base path */
- thunar_vfs_path_unref (chown_job->path);
-
- (*G_OBJECT_CLASS (thunar_vfs_chown_job_parent_class)->finalize) (object);
-}
-
-
-
-static void
-thunar_vfs_chown_job_execute (ThunarVfsJob *job)
-{
- ThunarVfsChownJob *chown_job = THUNAR_VFS_CHOWN_JOB (job);
- gboolean skip;
- gdouble percentage;
- GError *error = NULL;
- gchar *message;
- GList *path_list = NULL;
- GList *lp;
-
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (job), _("Collecting files..."));
-
- /* check if we should operate recursively and collect the paths */
- if (G_UNLIKELY (chown_job->recursive))
- path_list = thunar_vfs_scandir (chown_job->path, &job->cancelled, THUNAR_VFS_SCANDIR_RECURSIVE, NULL, NULL);
- path_list = thunar_vfs_path_list_prepend (path_list, chown_job->path);
-
- /* determine the total number of paths (atleast one!) */
- chown_job->total = g_list_length (path_list);
-
- /* process all paths */
- for (lp = path_list; !thunar_vfs_job_cancelled (job) && lp != NULL; lp = lp->next)
- {
- /* try to perform the operation */
- if (!thunar_vfs_chown_job_operate (chown_job, lp->data, &error))
- {
- /* no need to ask if this is the last file */
- if (G_UNLIKELY (lp->next == NULL))
- break;
-
- /* ask the user whether we should skip the file */
- message = g_strdup_printf (_("%s.\n\nDo you want to skip it?"), error->message);
- skip = thunar_vfs_interactive_job_skip (THUNAR_VFS_INTERACTIVE_JOB (job), message);
- g_clear_error (&error);
- g_free (message);
-
- /* check if we should skip */
- if (G_UNLIKELY (!skip))
- break;
- }
-
- /* we've just completed another item */
- chown_job->completed += 1;
-
- /* update the percentage */
- percentage = (chown_job->completed * 100.0) / chown_job->total;
- thunar_vfs_interactive_job_percent (THUNAR_VFS_INTERACTIVE_JOB (job), CLAMP (percentage, 0.0, 100.0));
-
- /* release the path */
- thunar_vfs_path_unref (lp->data);
- }
-
- /* emit an error if some operation failed */
- if (G_UNLIKELY (error != NULL))
- {
- thunar_vfs_job_error (job, error);
- g_error_free (error);
- }
-
- /* release the (remaining) path list */
- for (; lp != NULL; lp = lp->next)
- thunar_vfs_path_unref (lp->data);
- g_list_free (path_list);
-}
-
-
-
-static gboolean
-thunar_vfs_chown_job_operate (ThunarVfsChownJob *chown_job,
- ThunarVfsPath *path,
- GError **error)
-{
- const gchar *message;
- struct stat statb;
- gchar absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
- gchar *display_name;
- gid_t gid;
- uid_t uid;
-
- /* update the progress message */
- display_name = g_filename_display_name (thunar_vfs_path_get_name (path));
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (chown_job), display_name);
- g_free (display_name);
-
- /* determine the absolute path */
- if (thunar_vfs_path_to_string (path, absolute_path, sizeof (absolute_path), error) < 0)
- return FALSE;
-
- /* try to stat the file */
- if (stat (absolute_path, &statb) < 0)
- {
- /* we just ignore ENOENT here */
- if (G_UNLIKELY (errno == ENOENT))
- return TRUE;
-
- message = _("Failed to determine file info of \"%s\": %s");
- goto error;
- }
-
- /* determine new gid/uid */
- gid = (chown_job->gid < 0) ? statb.st_gid : chown_job->gid;
- uid = (chown_job->uid < 0) ? statb.st_uid : chown_job->uid;
-
- /* try to apply the new gid/uid */
- if (chown (absolute_path, uid, gid) < 0)
- {
- /* again, ignore ENOENT */
- if (G_UNLIKELY (errno == ENOENT))
- return TRUE;
-
- if (chown_job->uid < 0)
- message = _("Failed to change file owner of \"%s\": %s");
- else
- message = _("Failed to change file group of \"%s\": %s");
- goto error;
- }
-
- /* feed a change notification event */
- thunar_vfs_monitor_feed (chown_job->monitor, THUNAR_VFS_MONITOR_EVENT_CHANGED, path);
-
- /* we did it */
- return TRUE;
-
-error:
- display_name = g_filename_display_name (absolute_path);
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), message, display_name, g_strerror (errno));
- g_free (display_name);
- return FALSE;
-}
-
-
-
-/**
- * thunar_vfs_chown_job_new:
- * @path : the base path.
- * @uid : the new user id or %-1 to keep the old uid.
- * @gid : the new group id or %-1 to keep the old gid.
- * @recursive : whether to operate recursively.
- * @error : return location for errors or %NULL.
- *
- * Allocates a new #ThunarVfsChownJob instance, which is
- * used to change the owne of @path (and maybe subfiles
- * and subfolders, depending on @recursive).
- *
- * Return value: the newly allocated #ThunarVfsChownJob.
- **/
-ThunarVfsJob*
-thunar_vfs_chown_job_new (ThunarVfsPath *path,
- gint uid,
- gint gid,
- gboolean recursive,
- GError **error)
-{
- ThunarVfsChownJob *chown_job;
-
- g_return_val_if_fail (path != NULL, NULL);
- g_return_val_if_fail (uid >= 0 || gid >= 0, NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- /* allocate and initialize the new job */
- chown_job = g_object_new (THUNAR_VFS_TYPE_CHOWN_JOB, NULL);
- chown_job->path = thunar_vfs_path_ref (path);
- chown_job->uid = uid;
- chown_job->gid = gid;
- chown_job->recursive = recursive;
-
- return THUNAR_VFS_JOB (chown_job);
-}
-
-
-
-#define __THUNAR_VFS_TRANSFER_JOB_C__
-#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-chown-job.h b/thunar-vfs/thunar-vfs-chown-job.h
deleted file mode 100644
index 5bf770c2e8992121c08e6f72190c9e531f50b68e..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-chown-job.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * ownify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
-#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef __THUNAR_VFS_CHOWN_JOB_H__
-#define __THUNAR_VFS_CHOWN_JOB_H__
-
-#include <thunar-vfs/thunar-vfs-interactive-job.h>
-#include <thunar-vfs/thunar-vfs-path.h>
-#include <thunar-vfs/thunar-vfs-types.h>
-
-G_BEGIN_DECLS;
-
-typedef struct _ThunarVfsChownJobClass ThunarVfsChownJobClass;
-typedef struct _ThunarVfsChownJob ThunarVfsChownJob;
-
-#define THUNAR_VFS_TYPE_CHOWN_JOB (thunar_vfs_chown_job_get_type ())
-#define THUNAR_VFS_CHOWN_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_CHOWN_JOB, ThunarVfsChownJob))
-#define THUNAR_VFS_CHOWN_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_CHOWN_JOB, ThunarVfsChownJobClass))
-#define THUNAR_VFS_IS_CHOWN_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_CHOWN_JOB))
-#define THUNAR_VFS_IS_CHOWN_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_CHOWN_JOB))
-#define THUNAR_VFS_CHOWN_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_CHOWN_JOB, ThunarVfsChownJobClass))
-
-GType thunar_vfs_chown_job_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
-
-ThunarVfsJob *thunar_vfs_chown_job_new (ThunarVfsPath *path,
- gint uid,
- gint gid,
- gboolean recursive,
- GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_VFS_CHOWN_JOB_H__ */
diff --git a/thunar-vfs/thunar-vfs-creat-job.c b/thunar-vfs/thunar-vfs-creat-job.c
deleted file mode 100644
index 9ee1a78a2f7ddfe7b3c76f85251fc5f827b5bb42..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-creat-job.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <thunar-vfs/thunar-vfs-creat-job.h>
-#include <thunar-vfs/thunar-vfs-monitor.h>
-#include <thunar-vfs/thunar-vfs-private.h>
-#include <thunar-vfs/thunar-vfs-alias.h>
-
-
-
-static void thunar_vfs_creat_job_class_init (ThunarVfsCreatJobClass *klass);
-static void thunar_vfs_creat_job_init (ThunarVfsCreatJob *creat_job);
-static void thunar_vfs_creat_job_finalize (GObject *object);
-static void thunar_vfs_creat_job_execute (ThunarVfsJob *job);
-
-
-
-struct _ThunarVfsCreatJobClass
-{
- ThunarVfsInteractiveJobClass __parent__;
-};
-
-struct _ThunarVfsCreatJob
-{
- ThunarVfsInteractiveJob __parent__;
-
- ThunarVfsMonitor *monitor;
- GList *path_list;
-};
-
-
-
-static GObjectClass *thunar_vfs_creat_job_parent_class;
-
-
-
-GType
-thunar_vfs_creat_job_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_INTERACTIVE_JOB,
- "ThunarVfsCreatJob",
- sizeof (ThunarVfsCreatJobClass),
- thunar_vfs_creat_job_class_init,
- sizeof (ThunarVfsCreatJob),
- thunar_vfs_creat_job_init,
- 0);
- }
-
- return type;
-}
-
-
-
-static void
-thunar_vfs_creat_job_class_init (ThunarVfsCreatJobClass *klass)
-{
- ThunarVfsJobClass *thunarvfs_job_class;
- GObjectClass *gobject_class;
-
- /* determine the parent type class */
- thunar_vfs_creat_job_parent_class = g_type_class_peek_parent (klass);
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = thunar_vfs_creat_job_finalize;
-
- thunarvfs_job_class = THUNAR_VFS_JOB_CLASS (klass);
- thunarvfs_job_class->execute = thunar_vfs_creat_job_execute;
-}
-
-
-
-static void
-thunar_vfs_creat_job_init (ThunarVfsCreatJob *creat_job)
-{
- /* grab a reference on the VFS monitor */
- creat_job->monitor = thunar_vfs_monitor_get_default ();
-}
-
-
-
-static void
-thunar_vfs_creat_job_finalize (GObject *object)
-{
- ThunarVfsCreatJob *creat_job = THUNAR_VFS_CREAT_JOB (object);
-
- /* release our list of paths */
- thunar_vfs_path_list_free (creat_job->path_list);
-
- /* release the reference on the VFS monitor */
- g_object_unref (G_OBJECT (creat_job->monitor));
-
- (*G_OBJECT_CLASS (thunar_vfs_creat_job_parent_class)->finalize) (object);
-}
-
-
-
-static void
-thunar_vfs_creat_job_execute (ThunarVfsJob *job)
-{
- ThunarVfsCreatJob *creat_job = THUNAR_VFS_CREAT_JOB (job);
- gboolean overwrite;
- gboolean skip;
- gdouble percentage;
- gdouble completed = 0.0;
- GError *error = NULL;
- gchar absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
- gchar *display_name = NULL;
- gchar *message;
- GList *lp;
- gint flags;
- gint fd;
-
- /* process all paths */
- for (lp = creat_job->path_list; !thunar_vfs_job_cancelled (job) && lp != NULL; lp = lp->next)
- {
- /* determine the absolute path */
- if (thunar_vfs_path_to_string (lp->data, absolute_path, sizeof (absolute_path), &error) < 0)
- {
- thunar_vfs_job_error (job, error);
- g_error_free (error);
- break;
- }
-
- /* release the previous display name (if any) */
- g_free (display_name);
-
- /* determine a display name for the path */
- display_name = g_filename_display_name (absolute_path);
-
- /* update the info message */
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (job), display_name);
-
- /* first attempt for the open flags */
- flags = O_CREAT | O_EXCL | O_WRONLY;
-
-again:
- /* try to create the file at the given path */
- fd = open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0644);
- if (G_UNLIKELY (fd < 0))
- {
- /* check if the file already exists */
- if (G_UNLIKELY (errno == EEXIST))
- {
- /* ask the user whether to override this path */
- message = g_strdup_printf (_("The file \"%s\" already exists. Do you want to replace it with an empty file?"), display_name);
- overwrite = thunar_vfs_interactive_job_overwrite (THUNAR_VFS_INTERACTIVE_JOB (job), message);
- g_free (message);
-
- /* check if we should unlink the old file */
- if (G_UNLIKELY (overwrite))
- {
- /* try to unlink the file */
- if (unlink (absolute_path) < 0)
- {
- /* ask the user whether to skip this path */
- message = g_strdup_printf (_("Failed to remove \"%s\".\n\nDo you want to skip it?"), display_name);
- skip = thunar_vfs_interactive_job_skip (THUNAR_VFS_INTERACTIVE_JOB (job), message);
- g_free (message);
-
- /* check if we should skip */
- if (G_UNLIKELY (!skip))
- break;
- }
- else
- {
- goto again;
- }
- }
- }
- else
- {
- /* ask the user whether to skip this path */
- message = g_strdup_printf (_("Failed to create empty file \"%s\".\n\nDo you want to skip it?"), display_name);
- skip = thunar_vfs_interactive_job_skip (THUNAR_VFS_INTERACTIVE_JOB (job), message);
- g_free (message);
-
- /* check if we should skip */
- if (G_UNLIKELY (!skip))
- break;
- }
- }
- else
- {
- /* feed a change notification event */
- thunar_vfs_monitor_feed (creat_job->monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, lp->data);
-
- /* close the file */
- close (fd);
- }
-
- /* we've just completed another item */
- completed += 1;
-
- /* update the percentage */
- percentage = (completed * 100.0) / MAX (g_list_length (creat_job->path_list), 1);
- thunar_vfs_interactive_job_percent (THUNAR_VFS_INTERACTIVE_JOB (job), CLAMP (percentage, 0.0, 100.0));
- }
-
- /* emit the "new-files" signal with the given path list (if not empty) */
- if (G_LIKELY (creat_job->path_list != NULL))
- thunar_vfs_interactive_job_new_files (THUNAR_VFS_INTERACTIVE_JOB (job), creat_job->path_list);
-
- /* cleanup */
- g_free (display_name);
-}
-
-
-
-/**
- * thunar_vfs_creat_job_new:
- * @path_list : the list of #ThunarVfsPath<!---->s to create.
- * @error : return location for errors or %NULL.
- *
- * Allocates a new #ThunarVfsCreatJob to create new files at the
- * locations contained in the @path_list.
- *
- * The caller is responsible to free the returned object using
- * g_object_unref() when no longer needed.
- *
- * Return value: the newly allocated #ThunarVfsCreatJob or %NULL
- * on error.
- **/
-ThunarVfsJob*
-thunar_vfs_creat_job_new (GList *path_list,
- GError **error)
-{
- ThunarVfsCreatJob *creat_job;
-
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- /* allocate the new job */
- creat_job = g_object_new (THUNAR_VFS_TYPE_CREAT_JOB, NULL);
- creat_job->path_list = thunar_vfs_path_list_copy (path_list);
-
- return THUNAR_VFS_JOB (creat_job);
-}
-
-
-
-#define __THUNAR_VFS_LINK_JOB_C__
-#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-creat-job.h b/thunar-vfs/thunar-vfs-creat-job.h
deleted file mode 100644
index 380f620903e31578795cf1d5dcb3f16b912ac066..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-creat-job.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
-#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef __THUNAR_VFS_CREAT_JOB_H__
-#define __THUNAR_VFS_CREAT_JOB_H__
-
-#include <thunar-vfs/thunar-vfs-interactive-job.h>
-#include <thunar-vfs/thunar-vfs-path.h>
-
-G_BEGIN_DECLS;
-
-typedef struct _ThunarVfsCreatJobClass ThunarVfsCreatJobClass;
-typedef struct _ThunarVfsCreatJob ThunarVfsCreatJob;
-
-#define THUNAR_VFS_TYPE_CREAT_JOB (thunar_vfs_creat_job_get_type ())
-#define THUNAR_VFS_CREAT_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_CREAT_JOB, ThunarVfsCreatJob))
-#define THUNAR_VFS_CREAT_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_CREAT_JOB, ThunarVfsCreatJobClass))
-#define THUNAR_VFS_IS_CREAT_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_CREAT_JOB))
-#define THUNAR_VFS_IS_CREAT_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_CREAT_JOB))
-#define THUNAR_VFS_CREAT_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_CREAT_JOB, ThunarVfsCreatJobClass))
-
-GType thunar_vfs_creat_job_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
-
-ThunarVfsJob *thunar_vfs_creat_job_new (GList *path_list,
- GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_VFS_CREAT_JOB_H__ */
diff --git a/thunar-vfs/thunar-vfs-deep-count-job.c b/thunar-vfs/thunar-vfs-deep-count-job.c
index 54462dcd87d05f7a4bfcb9537e8826c934f75957..e6d6355c6c45344a13cebbc102f438cc6140aff5 100644
--- a/thunar-vfs/thunar-vfs-deep-count-job.c
+++ b/thunar-vfs/thunar-vfs-deep-count-job.c
@@ -36,13 +36,22 @@
#include <unistd.h>
#endif
-#include <glib/gstdio.h>
-
#include <thunar-vfs/thunar-vfs-deep-count-job.h>
+#include <thunar-vfs/thunar-vfs-io-trash.h>
+#include <thunar-vfs/thunar-vfs-job-private.h>
#include <thunar-vfs/thunar-vfs-marshal.h>
+#include <thunar-vfs/thunar-vfs-path-private.h>
#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
+/* use g_lstat() and g_stat() on win32 */
+#if defined(G_OS_WIN32)
+#include <glib/gstdio.h>
+#else
+#define g_lstat(path, statb) (lstat ((path), (statb)))
+#define g_stat(path, statb) (stat ((path), (statb)))
+#endif
+
/* Signal identifiers */
@@ -78,19 +87,19 @@ struct _ThunarVfsDeepCountJobClass
struct _ThunarVfsDeepCountJob
{
- ThunarVfsJob __parent__;
+ ThunarVfsJob __parent__;
- ThunarVfsDeepCountFlags flags;
- ThunarVfsPath *path;
+ gboolean follow_links;
+ ThunarVfsPath *path;
/* the time of the last "status-ready" emission */
- GTimeVal last_time;
+ GTimeVal last_time;
/* status information */
- guint64 total_size;
- guint file_count;
- guint directory_count;
- guint unreadable_directory_count;
+ guint64 total_size;
+ guint file_count;
+ guint directory_count;
+ guint unreadable_directory_count;
};
@@ -179,45 +188,77 @@ thunar_vfs_deep_count_job_execute (ThunarVfsJob *job)
{
ThunarVfsDeepCountJob *deep_count_job = THUNAR_VFS_DEEP_COUNT_JOB (job);
struct stat statb;
- GError *error;
+ GError *err = NULL;
gchar *absolute_path;
+ GList *path_list;
+ GList *lp;
- /* try to stat the base path */
- absolute_path = thunar_vfs_path_dup_string (deep_count_job->path);
- if (G_UNLIKELY (g_stat (absolute_path, &statb) < 0))
+ /* check if we should count the trash root folder */
+ if (G_UNLIKELY (_thunar_vfs_path_is_trash (deep_count_job->path)))
{
- /* tell the listeners that the job failed */
- error = g_error_new_literal (G_FILE_ERROR, g_file_error_from_errno (errno), g_strerror (errno));
- thunar_vfs_job_error (job, error);
- g_error_free (error);
+ /* count the trash root folder as directory */
+ deep_count_job->directory_count += 1;
+
+ /* scan the trash root folder */
+ path_list = _thunar_vfs_io_trash_scandir (deep_count_job->path, deep_count_job->follow_links, NULL, &err);
}
- else if (!S_ISDIR (statb.st_mode))
+ else
{
- /* the base path is not a directory */
- deep_count_job->total_size += statb.st_size;
- deep_count_job->file_count += 1;
+ /* just count the single item */
+ path_list = thunar_vfs_path_list_prepend (NULL, deep_count_job->path);
}
- else
+
+ /* process all paths */
+ for (lp = path_list; err == NULL && lp != NULL; lp = lp->next)
{
- /* process the directory recursively */
- if (thunar_vfs_deep_count_job_process (deep_count_job, absolute_path, &statb))
+ /* try to translate the path object to an absolute local path */
+ absolute_path = _thunar_vfs_path_translate_dup_string (lp->data, THUNAR_VFS_PATH_SCHEME_FILE, &err);
+ if (G_LIKELY (absolute_path != NULL))
{
- /* emit "status-ready" signal */
- thunar_vfs_job_emit (THUNAR_VFS_JOB (deep_count_job), deep_count_signals[STATUS_READY],
- 0, deep_count_job->total_size, deep_count_job->file_count,
- deep_count_job->directory_count, deep_count_job->unreadable_directory_count);
- }
- else
- {
- /* base directory not readable */
- error = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_IO, _("Failed to read folder contents"));
- thunar_vfs_job_error (job, error);
- g_error_free (error);
+ /* try to stat the file (handle broken links properly) */
+ if (g_stat (absolute_path, &statb) < 0 && g_lstat (absolute_path, &statb) < 0)
+ {
+ /* tell the listeners that the job failed */
+ _thunar_vfs_set_g_error_from_errno (&err, errno);
+ }
+ else if (!S_ISDIR (statb.st_mode))
+ {
+ /* the base path is not a directory */
+ deep_count_job->total_size += statb.st_size;
+ deep_count_job->file_count += 1;
+ }
+ else
+ {
+ /* process the directory recursively */
+ if (!thunar_vfs_deep_count_job_process (deep_count_job, absolute_path, &statb))
+ {
+ /* base directory not readable */
+ g_set_error (&err, G_FILE_ERROR, G_FILE_ERROR_IO, _("Failed to read folder contents"));
+ }
+ }
+
+ /* release the base path */
+ g_free (absolute_path);
}
}
- /* release the base path */
- g_free (absolute_path);
+ /* check if we had an error */
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* forward the error to the job owner */
+ _thunar_vfs_job_error (job, err);
+ g_error_free (err);
+ }
+ else
+ {
+ /* emit "status-ready" signal */
+ _thunar_vfs_job_emit (THUNAR_VFS_JOB (deep_count_job), deep_count_signals[STATUS_READY],
+ 0, deep_count_job->total_size, deep_count_job->file_count,
+ deep_count_job->directory_count, deep_count_job->unreadable_directory_count);
+ }
+
+ /* release the path_list */
+ thunar_vfs_path_list_free (path_list);
}
@@ -263,7 +304,7 @@ thunar_vfs_deep_count_job_process (ThunarVfsDeepCountJob *deep_count_job,
if (S_ISDIR (statb->st_mode))
{
/* check if this is a symlink to a folder */
- if (g_lstat (path, statb) == 0 && (!S_ISLNK (statb->st_mode) || (deep_count_job->flags & THUNAR_VFS_DEEP_COUNT_FLAGS_FOLLOW_SYMLINKS) != 0))
+ if (g_lstat (path, statb) == 0 && (!S_ISLNK (statb->st_mode) || deep_count_job->follow_links))
{
/* process the directory recursively */
if (thunar_vfs_deep_count_job_process (deep_count_job, path, statb))
@@ -332,9 +373,9 @@ thunar_vfs_deep_count_job_status_ready (ThunarVfsDeepCountJob *deep_count_job)
deep_count_job->last_time = current_time;
/* emit "status-ready" signal */
- thunar_vfs_job_emit (THUNAR_VFS_JOB (deep_count_job), deep_count_signals[STATUS_READY],
- 0, deep_count_job->total_size, deep_count_job->file_count,
- deep_count_job->directory_count, deep_count_job->unreadable_directory_count);
+ _thunar_vfs_job_emit (THUNAR_VFS_JOB (deep_count_job), deep_count_signals[STATUS_READY],
+ 0, deep_count_job->total_size, deep_count_job->file_count,
+ deep_count_job->directory_count, deep_count_job->unreadable_directory_count);
}
}
}
@@ -368,8 +409,12 @@ thunar_vfs_deep_count_job_new (ThunarVfsPath *path,
/* allocate the new job */
deep_count_job = g_object_new (THUNAR_VFS_TYPE_DEEP_COUNT_JOB, NULL);
deep_count_job->path = thunar_vfs_path_ref (path);
- deep_count_job->flags = flags;
+ deep_count_job->follow_links = (flags & THUNAR_VFS_DEEP_COUNT_FLAGS_FOLLOW_SYMLINKS);
return THUNAR_VFS_JOB (deep_count_job);
}
+
+
+#define __THUNAR_VFS_DEEP_COUNT_JOB_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-deep-count-job.h b/thunar-vfs/thunar-vfs-deep-count-job.h
index 2656cf78b19ba773dc79f13f9501f31fcb040617..cd261a49e71041afb39c69d3d4b951d449e0fa73 100644
--- a/thunar-vfs/thunar-vfs-deep-count-job.h
+++ b/thunar-vfs/thunar-vfs-deep-count-job.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
-#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
#endif
#ifndef __THUNAR_VFS_DEEP_COUNT_JOB_H__
diff --git a/thunar-vfs/thunar-vfs-exec.c b/thunar-vfs/thunar-vfs-exec.c
index 5341e87e40366d82b68394f6edbbc458997a2d0a..12dbcd6605241d2e994db77d070ad6fc4fd2c39b 100644
--- a/thunar-vfs/thunar-vfs-exec.c
+++ b/thunar-vfs/thunar-vfs-exec.c
@@ -40,7 +40,7 @@
#endif
#include <thunar-vfs/thunar-vfs-exec.h>
-#include <thunar-vfs/thunar-vfs-path.h>
+#include <thunar-vfs/thunar-vfs-path-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
#ifdef GDK_WINDOWING_X11
@@ -50,6 +50,63 @@
+static void tve_string_append_quoted (GString *string,
+ const gchar *unquoted);
+static gboolean tve_string_append_quoted_path (GString *string,
+ ThunarVfsPath *path,
+ GError **error);
+static void tve_string_append_quoted_uri (GString *string,
+ const ThunarVfsPath *path);
+
+
+
+static void
+tve_string_append_quoted (GString *string,
+ const gchar *unquoted)
+{
+ gchar *quoted;
+
+ quoted = g_shell_quote (unquoted);
+ g_string_append (string, quoted);
+ g_free (quoted);
+}
+
+
+
+static gboolean
+tve_string_append_quoted_path (GString *string,
+ ThunarVfsPath *path,
+ GError **error)
+{
+ gchar *absolute_path;
+
+ /* append the absolute, local, quoted path to the string */
+ absolute_path = _thunar_vfs_path_translate_dup_string (path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_LIKELY (absolute_path != NULL))
+ {
+ tve_string_append_quoted (string, absolute_path);
+ g_free (absolute_path);
+ }
+
+ return (absolute_path != NULL);
+}
+
+
+
+static void
+tve_string_append_quoted_uri (GString *string,
+ const ThunarVfsPath *path)
+{
+ gchar *uri;
+
+ /* append the quoted URI for the path */
+ uri = thunar_vfs_path_dup_uri (path);
+ tve_string_append_quoted (string, uri);
+ g_free (uri);
+}
+
+
+
/**
* thunar_vfs_exec_parse:
* @exec : the value of the <literal>Exec</literal> field.
@@ -89,13 +146,11 @@ thunar_vfs_exec_parse (const gchar *exec,
gchar ***argv,
GError **error)
{
- const ThunarVfsPath *parent;
- const gchar *p;
- gboolean result = FALSE;
- GString *command_line = g_string_new (NULL);
- GList *lp;
- gchar buffer[THUNAR_VFS_PATH_MAXURILEN];
- gchar *quoted;
+ ThunarVfsPath *parent;
+ const gchar *p;
+ gboolean result = FALSE;
+ GString *command_line = g_string_new (NULL);
+ GList *lp;
/* prepend terminal command if required */
if (G_UNLIKELY (terminal))
@@ -108,15 +163,9 @@ thunar_vfs_exec_parse (const gchar *exec,
switch (*++p)
{
case 'f':
- if (G_LIKELY (path_list != NULL))
- {
- if (thunar_vfs_path_to_string (path_list->data, buffer, sizeof (buffer), error) < 0)
- goto done;
-
- quoted = g_shell_quote (buffer);
- g_string_append (command_line, quoted);
- g_free (quoted);
- }
+ /* append the absolute local path of the first path object */
+ if (path_list != NULL && !tve_string_append_quoted_path (command_line, path_list->data, error))
+ goto done;
break;
case 'F':
@@ -124,26 +173,14 @@ thunar_vfs_exec_parse (const gchar *exec,
{
if (G_LIKELY (lp != path_list))
g_string_append_c (command_line, ' ');
-
- if (thunar_vfs_path_to_string (lp->data, buffer, sizeof (buffer), error) < 0)
+ if (!tve_string_append_quoted_path (command_line, lp->data, error))
goto done;
-
- quoted = g_shell_quote (buffer);
- g_string_append (command_line, quoted);
- g_free (quoted);
}
break;
case 'u':
if (G_LIKELY (path_list != NULL))
- {
- if (thunar_vfs_path_to_uri (path_list->data, buffer, sizeof (buffer), error) < 0)
- goto done;
-
- quoted = g_shell_quote (buffer);
- g_string_append (command_line, quoted);
- g_free (quoted);
- }
+ tve_string_append_quoted_uri (command_line, path_list->data);
break;
case 'U':
@@ -151,13 +188,7 @@ thunar_vfs_exec_parse (const gchar *exec,
{
if (G_LIKELY (lp != path_list))
g_string_append_c (command_line, ' ');
-
- if (thunar_vfs_path_to_uri (lp->data, buffer, sizeof (buffer), error) < 0)
- goto done;
-
- quoted = g_shell_quote (buffer);
- g_string_append (command_line, quoted);
- g_free (quoted);
+ tve_string_append_quoted_uri (command_line, lp->data);
}
break;
@@ -165,15 +196,8 @@ thunar_vfs_exec_parse (const gchar *exec,
if (G_LIKELY (path_list != NULL))
{
parent = thunar_vfs_path_get_parent (path_list->data);
- if (G_LIKELY (parent != NULL))
- {
- if (thunar_vfs_path_to_string (parent, buffer, sizeof (buffer), error) < 0)
- goto done;
-
- quoted = g_shell_quote (buffer);
- g_string_append (command_line, quoted);
- g_free (quoted);
- }
+ if (parent != NULL && !tve_string_append_quoted_path (command_line, parent, error))
+ goto done;
}
break;
@@ -185,24 +209,15 @@ thunar_vfs_exec_parse (const gchar *exec,
{
if (G_LIKELY (lp != path_list))
g_string_append_c (command_line, ' ');
-
- if (thunar_vfs_path_to_string (parent, buffer, sizeof (buffer), error) < 0)
+ if (!tve_string_append_quoted_path (command_line, parent, error))
goto done;
-
- quoted = g_shell_quote (buffer);
- g_string_append (command_line, quoted);
- g_free (quoted);
}
}
break;
case 'n':
if (G_LIKELY (path_list != NULL))
- {
- quoted = g_shell_quote (thunar_vfs_path_get_name (path_list->data));
- g_string_append (command_line, quoted);
- g_free (quoted);
- }
+ tve_string_append_quoted (command_line, thunar_vfs_path_get_name (path_list->data));
break;
case 'N':
@@ -210,38 +225,26 @@ thunar_vfs_exec_parse (const gchar *exec,
{
if (G_LIKELY (lp != path_list))
g_string_append_c (command_line, ' ');
- quoted = g_shell_quote (thunar_vfs_path_get_name (lp->data));
- g_string_append (command_line, quoted);
- g_free (quoted);
+ tve_string_append_quoted (command_line, thunar_vfs_path_get_name (lp->data));
}
break;
case 'i':
if (G_LIKELY (icon != NULL))
{
- quoted = g_shell_quote (icon);
g_string_append (command_line, "--icon ");
- g_string_append (command_line, quoted);
- g_free (quoted);
+ tve_string_append_quoted (command_line, icon);
}
break;
case 'c':
if (G_LIKELY (name != NULL))
- {
- quoted = g_shell_quote (name);
- g_string_append (command_line, quoted);
- g_free (quoted);
- }
+ tve_string_append_quoted (command_line, name);
break;
case 'k':
if (G_LIKELY (path != NULL))
- {
- quoted = g_shell_quote (path);
- g_string_append (command_line, path);
- g_free (quoted);
- }
+ tve_string_append_quoted (command_line, path);
break;
case '%':
@@ -523,3 +526,6 @@ thunar_vfs_exec_sync (const gchar *command_fmt,
}
+
+#define __THUNAR_VFS_EXEC_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-info.c b/thunar-vfs/thunar-vfs-info.c
index d560ed5e2a223704cbb121144b84c6016851e803..11fc854f30381191cbf640b2f82d18169e28d114 100644
--- a/thunar-vfs/thunar-vfs-info.c
+++ b/thunar-vfs/thunar-vfs-info.c
@@ -22,32 +22,9 @@
#include <config.h>
#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_STATFS_H
-#include <sys/statfs.h>
-#endif
-#ifdef HAVE_SYS_STATVFS_H
-#include <sys/statvfs.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
#ifdef HAVE_MEMORY_H
#include <memory.h>
#endif
-#include <stdio.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@ -61,34 +38,12 @@
#include <thunar-vfs/thunar-vfs-info.h>
#include <thunar-vfs/thunar-vfs-exec.h>
-#include <thunar-vfs/thunar-vfs-mime-database.h>
+#include <thunar-vfs/thunar-vfs-io-local.h>
+#include <thunar-vfs/thunar-vfs-io-trash.h>
+#include <thunar-vfs/thunar-vfs-mime-database-private.h>
+#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
-/* Use g_access(), g_lstat() and g_stat() on win32 */
-#if GLIB_CHECK_VERSION(2,8,0) && defined(G_OS_WIN32)
-#include <glib/gstdio.h>
-#else
-#define g_access(path, mode) (access ((path), (mode)))
-#define g_lstat(path, statb) (lstat ((path), (statb)))
-#define g_stat(path, statb) (stat ((path), (statb)))
-#endif
-
-/* Use g_rename() on win32 */
-#if GLIB_CHECK_VERSION(2,6,0) && defined(G_OS_WIN32)
-#include <glib/gstdio.h>
-#else
-#define g_rename(from, to) (rename ((from), (to)))
-#endif
-
-
-
-static ThunarVfsMimeDatabase *mime_database;
-static ThunarVfsMimeInfo *mime_application_octet_stream;
-static ThunarVfsMimeInfo *mime_application_x_shellscript;
-static ThunarVfsMimeInfo *mime_application_x_executable;
-static ThunarVfsMimeInfo *mime_application_x_desktop;
-static ThunarVfsMimeInfo *mime_inode_directory;
-
GType
@@ -124,10 +79,29 @@ ThunarVfsInfo*
thunar_vfs_info_new_for_path (ThunarVfsPath *path,
GError **error)
{
- gchar absolute_path[PATH_MAX + 1];
- if (thunar_vfs_path_to_string (path, absolute_path, sizeof (absolute_path), error) < 0)
- return NULL;
- return _thunar_vfs_info_new_internal (path, absolute_path, error);
+ ThunarVfsInfo *info;
+ gchar *absolute_path;
+
+ g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ switch (thunar_vfs_path_get_scheme (path))
+ {
+ case THUNAR_VFS_PATH_SCHEME_FILE:
+ absolute_path = thunar_vfs_path_dup_string (path);
+ info = _thunar_vfs_io_local_get_info (path, absolute_path, error);
+ g_free (absolute_path);
+ break;
+
+ case THUNAR_VFS_PATH_SCHEME_TRASH:
+ info = _thunar_vfs_io_trash_get_info (path, error);
+ break;
+
+ default:
+ g_assert_not_reached ();
+ info = NULL;
+ }
+
+ return info;
}
@@ -156,11 +130,8 @@ thunar_vfs_info_unref (ThunarVfsInfo *info)
thunar_vfs_mime_info_unref (info->mime_info);
thunar_vfs_path_unref (info->path);
-#ifdef G_ENABLE_DEBUG
- memset (info, 0xaa, sizeof (*info));
-#endif
-
- g_free (info);
+ /* release the memory */
+ _thunar_vfs_slice_free (ThunarVfsInfo, info);
}
}
@@ -182,7 +153,7 @@ thunar_vfs_info_copy (const ThunarVfsInfo *info)
g_return_val_if_fail (info != NULL, NULL);
- dst = g_new (ThunarVfsInfo, 1);
+ dst = _thunar_vfs_slice_new (ThunarVfsInfo);
dst->type = info->type;
dst->mode = info->mode;
dst->flags = info->flags;
@@ -223,72 +194,60 @@ gboolean
thunar_vfs_info_get_free_space (const ThunarVfsInfo *info,
ThunarVfsFileSize *free_space_return)
{
-#if defined(HAVE_STATFS) && !defined(__sgi__) && !defined(__sun__)
- struct statfs statfsb;
-#elif defined(HAVE_STATVFS)
- struct statvfs statvfsb;
-#endif
- gchar absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
+ ThunarVfsPath *path;
+ gboolean succeed = FALSE;
g_return_val_if_fail (info != NULL, FALSE);
- g_return_val_if_fail (info->ref_count > 0, FALSE);
-
- /* determine the absolute path */
- if (thunar_vfs_path_to_string (info->path, absolute_path, sizeof (absolute_path), NULL) < 0)
- return FALSE;
-#if defined(HAVE_STATFS) && !defined(__sgi__) && !defined(__sun__)
- if (statfs (absolute_path, &statfsb) == 0)
+ /* translate the info's path to a file:-URI path */
+ path = _thunar_vfs_path_translate (info->path, THUNAR_VFS_PATH_SCHEME_FILE, NULL);
+ if (G_UNLIKELY (path != NULL))
{
- /* good old BSD way */
- if (G_LIKELY (free_space_return != NULL))
- *free_space_return = (statfsb.f_bavail * statfsb.f_bsize);
- return TRUE;
+ /* determine the amount of free space for the path */
+ succeed = _thunar_vfs_io_local_get_free_space (path, free_space_return);
+ thunar_vfs_path_unref (path);
}
-#elif defined(HAVE_STATVFS)
- if (statvfs (absolute_path, &statvfsb) == 0)
- {
- /* Linux, IRIX, Solaris way */
- if (G_LIKELY (free_space_return != NULL))
- *free_space_return = (statvfsb.f_bavail * statvfsb.f_bsize);
- return TRUE;
- }
-#endif
- /* unable to determine the amount of free space */
- return FALSE;
+ return succeed;
}
/**
- * thunar_vfs_info_read_link:
- * @info : a #ThunarVfsInfo.
- * @error : return location for errors or %NULL.
+ * thunar_vfs_info_get_metadata:
+ * @info : a #ThunarVfsInfo.
+ * @metadata : the #ThunarVfsInfoMetadata you are interested in.
+ * @error : return location for errors or %NULL.
+ *
+ * Queries the @metadata for @info and returns a string with the
+ * data, or %NULL if either @metadata is invalid for @info or an
+ * error occurred while querying the @metadata.
*
- * Reads the contents of the symbolic link to which @info refers to,
- * like the POSIX readlink() function. The returned string is in the
- * encoding used for filenames.
+ * The caller is responsible to free the returned string using
+ * g_free() when no longer needed.
*
- * Return value: a newly allocated string with the contents of the
- * symbolic link, or %NULL if an error occurred.
+ * Return value: the @metadata for @info or %NULL in case of an
+ * error.
**/
gchar*
-thunar_vfs_info_read_link (const ThunarVfsInfo *info,
- GError **error)
+thunar_vfs_info_get_metadata (const ThunarVfsInfo *info,
+ ThunarVfsInfoMetadata metadata,
+ GError **error)
{
- gchar absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
-
- g_return_val_if_fail (info != NULL, NULL);
- g_return_val_if_fail (info->ref_count > 0, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- /* determine the absolute path */
- if (thunar_vfs_path_to_string (info->path, absolute_path, sizeof (absolute_path), error) < 0)
- return NULL;
+ switch (thunar_vfs_path_get_scheme (info->path))
+ {
+ case THUNAR_VFS_PATH_SCHEME_FILE:
+ return _thunar_vfs_io_local_get_metadata (info->path, metadata, error);
+
+ case THUNAR_VFS_PATH_SCHEME_TRASH:
+ return _thunar_vfs_io_trash_get_metadata (info->path, metadata, error);
- /* determine the link target */
- return g_file_read_link (absolute_path, error);
+ default:
+ g_assert_not_reached ();
+ return NULL;
+ }
}
@@ -329,14 +288,13 @@ thunar_vfs_info_execute (const ThunarVfsInfo *info,
gboolean terminal;
gboolean result = FALSE;
XfceRc *rc;
- gchar absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
+ gchar *absolute_path;
gchar *path_escaped;
gchar *directory;
gchar **argv = NULL;
gchar *exec;
g_return_val_if_fail (info != NULL, FALSE);
- g_return_val_if_fail (info->ref_count > 0, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
g_return_val_if_fail (working_directory == NULL || g_path_is_absolute (working_directory), FALSE);
@@ -345,12 +303,13 @@ thunar_vfs_info_execute (const ThunarVfsInfo *info,
if (G_UNLIKELY (screen == NULL))
screen = gdk_screen_get_default ();
- /* determine the absolute path */
- if (thunar_vfs_path_to_string (info->path, absolute_path, sizeof (absolute_path), error) < 0)
+ /* determine the absolute path in the file:-URI scheme */
+ absolute_path = _thunar_vfs_path_translate_dup_string (info->path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_UNLIKELY (absolute_path == NULL))
return FALSE;
/* check if we have a .desktop (and NOT a .directory) file here */
- if (G_UNLIKELY (info->mime_info == mime_application_x_desktop && strcmp (thunar_vfs_path_get_name (info->path), ".directory") != 0))
+ if (G_UNLIKELY (info->mime_info == _thunar_vfs_mime_application_x_desktop && strcmp (thunar_vfs_path_get_name (info->path), ".directory") != 0))
{
rc = xfce_rc_simple_open (absolute_path, TRUE);
if (G_LIKELY (rc != NULL))
@@ -431,9 +390,9 @@ thunar_vfs_info_execute (const ThunarVfsInfo *info,
}
else if (G_LIKELY (path_list != NULL))
{
- /* use the directory of the first list item */
+ /* use the directory (in the file:-URI scheme) of the first list item */
parent = thunar_vfs_path_get_parent (path_list->data);
- directory = (parent != NULL) ? thunar_vfs_path_dup_string (parent) : NULL;
+ directory = (parent != NULL) ? _thunar_vfs_path_translate_dup_string (parent, THUNAR_VFS_PATH_SCHEME_FILE, NULL) : NULL;
}
else
{
@@ -449,6 +408,7 @@ thunar_vfs_info_execute (const ThunarVfsInfo *info,
}
/* clean up */
+ g_free (absolute_path);
g_strfreev (argv);
return result;
@@ -481,20 +441,7 @@ thunar_vfs_info_rename (ThunarVfsInfo *info,
const gchar *name,
GError **error)
{
- const gchar * const *locale;
- ThunarVfsMimeInfo *mime_info;
- GKeyFile *key_file;
- gsize data_length;
- gchar *data;
- gchar *key;
- gchar src_path[PATH_MAX + 1];
- gchar *dir_name;
- gchar *dst_name;
- gchar *dst_path;
- FILE *fp;
-
g_return_val_if_fail (info != NULL, FALSE);
- g_return_val_if_fail (info->ref_count > 0, FALSE);
g_return_val_if_fail (g_utf8_validate (name, -1, NULL), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -505,142 +452,14 @@ thunar_vfs_info_rename (ThunarVfsInfo *info,
return FALSE;
}
- /* determine the source path */
- if (thunar_vfs_path_to_string (info->path, src_path, sizeof (src_path), error) < 0)
- return FALSE;
-
- /* check if we have a .desktop (and NOT a .directory) file here */
- if (G_UNLIKELY (info->mime_info == mime_application_x_desktop && strcmp (thunar_vfs_path_get_name (info->path), ".directory") != 0))
+ /* validate the info */
+ if (!_thunar_vfs_path_is_local (info->path))
{
- /* try to open the .desktop file */
- key_file = g_key_file_new ();
- if (!g_key_file_load_from_file (key_file, src_path, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, error))
- {
- g_key_file_free (key_file);
- return FALSE;
- }
-
- /* check if the file is valid */
- if (G_UNLIKELY (!g_key_file_has_group (key_file, "Desktop Entry")))
- {
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Invalid desktop file"));
- g_key_file_free (key_file);
- return FALSE;
- }
-
- /* save the new name (localized if required) */
- for (locale = g_get_language_names (); *locale != NULL; ++locale)
- {
- key = g_strdup_printf ("Name[%s]", *locale);
- if (g_key_file_has_key (key_file, "Desktop Entry", key, NULL))
- {
- g_key_file_set_string (key_file, "Desktop Entry", key, name);
- g_free (key);
- break;
- }
- g_free (key);
- }
-
- /* fallback to unlocalized name */
- if (G_UNLIKELY (*locale == NULL))
- g_key_file_set_string (key_file, "Desktop Entry", "Name", name);
-
- /* serialize the key file to a buffer */
- data = g_key_file_to_data (key_file, &data_length, error);
- g_key_file_free (key_file);
- if (G_UNLIKELY (data == NULL))
- return FALSE;
-
- /* try to open the file for writing */
- fp = fopen (src_path, "w");
- if (G_UNLIKELY (fp == NULL))
- {
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), g_strerror (errno));
- g_free (data);
- return FALSE;
- }
-
- /* write the data back to the file */
- if (fwrite (data, data_length, 1, fp) != 1)
- {
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), g_strerror (errno));
- g_free (data);
- fclose (fp);
- return FALSE;
- }
-
- /* close the file */
- fclose (fp);
-
- /* release the previous display name */
- if (G_LIKELY (info->display_name != thunar_vfs_path_get_name (info->path)))
- g_free (info->display_name);
-
- /* apply the new display name */
- info->display_name = g_strdup (name);
-
- /* clean up */
- g_free (data);
- }
- else
- {
- /* convert the destination file to local encoding */
- dst_name = g_filename_from_utf8 (name, -1, NULL, NULL, error);
- if (G_UNLIKELY (dst_name == NULL))
- return FALSE;
-
- /* determine the destination path */
- dir_name = g_path_get_dirname (src_path);
- dst_path = g_build_filename (dir_name, dst_name, NULL);
- g_free (dst_name);
- g_free (dir_name);
-
- /* verify that the rename target does not already exist */
- if (G_UNLIKELY (g_file_test (dst_path, G_FILE_TEST_EXISTS)))
- {
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_EXIST, g_strerror (EEXIST));
- g_free (dst_path);
- return FALSE;
- }
-
- /* perform the rename */
- if (G_UNLIKELY (g_rename (src_path, dst_path) < 0))
- {
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), g_strerror (errno));
- g_free (dst_path);
- return FALSE;
- }
-
- /* update the info's display name */
- if (info->display_name != thunar_vfs_path_get_name (info->path))
- g_free (info->display_name);
- info->display_name = g_strdup (name);
-
- /* check if this is a hidden file now */
- if (strlen (name) > 1 && (g_str_has_prefix (name, ".") || g_str_has_prefix (name, "~")))
- info->flags |= THUNAR_VFS_FILE_FLAGS_HIDDEN;
- else
- info->flags &= ~THUNAR_VFS_FILE_FLAGS_HIDDEN;
-
- /* update the info's path */
- thunar_vfs_path_unref (info->path);
- info->path = thunar_vfs_path_new (dst_path, NULL);
-
- /* if we have a regular file here, then we'll need to determine
- * the mime type again, as it may be based on the file name
- */
- if (G_LIKELY (info->type == THUNAR_VFS_FILE_TYPE_REGULAR))
- {
- mime_info = info->mime_info;
- info->mime_info = thunar_vfs_mime_database_get_info_for_file (mime_database, dst_path, info->display_name);
- thunar_vfs_mime_info_unref (mime_info);
- }
-
- /* clean up */
- g_free (dst_path);
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Only local files may be renamed"));
+ return FALSE;
}
- return TRUE;
+ return _thunar_vfs_io_local_rename (info, name, error);
}
@@ -661,8 +480,6 @@ thunar_vfs_info_matches (const ThunarVfsInfo *a,
{
g_return_val_if_fail (a != NULL, FALSE);
g_return_val_if_fail (b != NULL, FALSE);
- g_return_val_if_fail (a->ref_count > 0, FALSE);
- g_return_val_if_fail (b->ref_count > 0, FALSE);
return a->type == b->type
&& a->mode == b->mode
@@ -682,341 +499,17 @@ thunar_vfs_info_matches (const ThunarVfsInfo *a,
/**
- * _thunar_vfs_info_init:
- *
- * Initializes the info component of the Thunar-VFS
- * library.
- **/
-void
-_thunar_vfs_info_init (void)
-{
- /* grab a reference on the mime database */
- mime_database = thunar_vfs_mime_database_get_default ();
-
- /* pre-determine the most important mime types */
- mime_inode_directory = thunar_vfs_mime_database_get_info (mime_database, "inode/directory");
- mime_application_x_desktop = thunar_vfs_mime_database_get_info (mime_database, "application/x-desktop");
- mime_application_x_executable = thunar_vfs_mime_database_get_info (mime_database, "application/x-executable");
- mime_application_x_shellscript = thunar_vfs_mime_database_get_info (mime_database, "application/x-shellscript");
- mime_application_octet_stream = thunar_vfs_mime_database_get_info (mime_database, "application/octet-stream");
-}
-
-
-
-/**
- * _thunar_vfs_info_shutdown:
+ * thunar_vfs_info_list_free:
+ * @info_list : a list of #ThunarVfsInfo<!---->s.
*
- * Shuts down the info component of the Thunar-VFS
- * library.
+ * Unrefs all #ThunarVfsInfo<!---->s in @info_list and
+ * frees the list itself.
**/
void
-_thunar_vfs_info_shutdown (void)
-{
- /* release the mime type references */
- thunar_vfs_mime_info_unref (mime_application_octet_stream);
- thunar_vfs_mime_info_unref (mime_application_x_shellscript);
- thunar_vfs_mime_info_unref (mime_application_x_executable);
- thunar_vfs_mime_info_unref (mime_application_x_desktop);
- thunar_vfs_mime_info_unref (mime_inode_directory);
-
- /* release the reference on the mime database */
- g_object_unref (G_OBJECT (mime_database));
- mime_database = NULL;
-}
-
-
-
-/**
- * _thunar_vfs_info_new_internal:
- * @path
- * @absolute_path
- * @error : return location for errors or %NULL.
- *
- * Return value:
- **/
-ThunarVfsInfo*
-_thunar_vfs_info_new_internal (ThunarVfsPath *path,
- const gchar *absolute_path,
- GError **error)
+thunar_vfs_info_list_free (GList *info_list)
{
- ThunarVfsMimeInfo *fake_mime_info;
- ThunarVfsInfo *info;
- const guchar *s;
- const gchar *name;
- const gchar *str;
- struct stat lsb;
- struct stat sb;
- XfceRc *rc;
- GList *mime_infos;
- GList *lp;
- gchar *p;
-
- g_return_val_if_fail (g_path_is_absolute (absolute_path), NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- if (G_UNLIKELY (g_lstat (absolute_path, &lsb) < 0))
- {
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
- /* TRANSLATORS: See man page of stat(1) or stat(2) for more details. */
- _("Failed to stat file \"%s\": %s"),
- absolute_path, g_strerror (errno));
- return NULL;
- }
-
- info = g_new (ThunarVfsInfo, 1);
- info->path = thunar_vfs_path_ref (path);
- info->ref_count = 1;
- info->custom_icon = NULL;
-
- /* determine the display name of the file */
- name = thunar_vfs_path_get_name (path);
- for (s = (const guchar *) name; *s >= 32 && *s <= 127; ++s)
- ;
- if (G_LIKELY (*s == '\0'))
- {
- /* we don't need to perform any transformation if
- * the file contains only valid ASCII characters.
- */
- info->display_name = (gchar *) name;
- }
- else
- {
- /* determine the displayname using various tricks */
- info->display_name = g_filename_display_name (name);
-
- /* go on until s reaches the end of the string, as
- * we need it for the hidden file detection below.
- */
- for (; *s != '\0'; ++s)
- ;
- }
-
- /* check whether we have a hidden file here */
- if ((s - (const guchar *) name) > 1 && (*name == '.' || *(s - 1) == '~'))
- info->flags = THUNAR_VFS_FILE_FLAGS_HIDDEN;
- else
- info->flags = THUNAR_VFS_FILE_FLAGS_NONE;
-
- /* determine the POSIX file attributes */
- if (G_LIKELY (!S_ISLNK (lsb.st_mode)))
- {
- info->type = (lsb.st_mode & S_IFMT) >> 12;
- info->mode = lsb.st_mode & 07777;
- info->uid = lsb.st_uid;
- info->gid = lsb.st_gid;
- info->size = lsb.st_size;
- info->atime = lsb.st_atime;
- info->ctime = lsb.st_ctime;
- info->mtime = lsb.st_mtime;
- info->device = lsb.st_dev;
- }
- else
- {
- /* whatever comes, we have a symlink here */
- info->flags |= THUNAR_VFS_FILE_FLAGS_SYMLINK;
-
- /* check if it's a broken link */
- if (g_stat (absolute_path, &sb) == 0)
- {
- info->type = (sb.st_mode & S_IFMT) >> 12;
- info->mode = sb.st_mode & 07777;
- info->uid = sb.st_uid;
- info->gid = sb.st_gid;
- info->size = sb.st_size;
- info->atime = sb.st_atime;
- info->ctime = sb.st_ctime;
- info->mtime = sb.st_mtime;
- info->device = sb.st_dev;
- }
- else
- {
- info->type = THUNAR_VFS_FILE_TYPE_SYMLINK;
- info->mode = lsb.st_mode & 07777;
- info->uid = lsb.st_uid;
- info->gid = lsb.st_gid;
- info->size = lsb.st_size;
- info->atime = lsb.st_atime;
- info->ctime = lsb.st_ctime;
- info->mtime = lsb.st_mtime;
- info->device = lsb.st_dev;
- }
- }
-
- /* check if we can read the file */
- if ((info->mode & 00444) != 0 && g_access (absolute_path, R_OK) == 0)
- info->flags |= THUNAR_VFS_FILE_FLAGS_READABLE;
-
- /* check if we can write to the file */
- if ((info->mode & 00222) != 0 && g_access (absolute_path, W_OK) == 0)
- info->flags |= THUNAR_VFS_FILE_FLAGS_WRITABLE;
-
- /* determine the file's mime type */
- switch (info->type)
- {
- case THUNAR_VFS_FILE_TYPE_PORT:
- info->mime_info = thunar_vfs_mime_database_get_info (mime_database, "inode/port");
- break;
-
- case THUNAR_VFS_FILE_TYPE_DOOR:
- info->mime_info = thunar_vfs_mime_database_get_info (mime_database, "inode/door");
- break;
-
- case THUNAR_VFS_FILE_TYPE_SOCKET:
- info->mime_info = thunar_vfs_mime_database_get_info (mime_database, "inode/socket");
- break;
-
- case THUNAR_VFS_FILE_TYPE_SYMLINK:
- info->mime_info = thunar_vfs_mime_database_get_info (mime_database, "inode/symlink");
- break;
-
- case THUNAR_VFS_FILE_TYPE_BLOCKDEV:
- info->mime_info = thunar_vfs_mime_database_get_info (mime_database, "inode/blockdevice");
- break;
-
- case THUNAR_VFS_FILE_TYPE_DIRECTORY:
- info->mime_info = thunar_vfs_mime_info_ref (mime_inode_directory);
- break;
-
- case THUNAR_VFS_FILE_TYPE_CHARDEV:
- info->mime_info = thunar_vfs_mime_database_get_info (mime_database, "inode/chardevice");
- break;
-
- case THUNAR_VFS_FILE_TYPE_FIFO:
- info->mime_info = thunar_vfs_mime_database_get_info (mime_database, "inode/fifo");
- break;
-
- case THUNAR_VFS_FILE_TYPE_REGULAR:
- /* determine the MIME-type for the regular file */
- info->mime_info = thunar_vfs_mime_database_get_info_for_file (mime_database, absolute_path, info->display_name);
-
- /* check if the file is executable (for security reasons
- * we only allow execution of well known file types).
- */
- if ((info->mode & 0444) != 0 && g_access (absolute_path, X_OK) == 0)
- {
- mime_infos = thunar_vfs_mime_database_get_infos_for_info (mime_database, info->mime_info);
- for (lp = mime_infos; lp != NULL; lp = lp->next)
- {
- if (lp->data == mime_application_x_executable || lp->data == mime_application_x_shellscript)
- {
- info->flags |= THUNAR_VFS_FILE_FLAGS_EXECUTABLE;
- break;
- }
- }
- thunar_vfs_mime_info_list_free (mime_infos);
- }
-
- /* check if we have a .desktop (and NOT a .directory) file here */
- if (G_UNLIKELY (info->mime_info == mime_application_x_desktop && strcmp (thunar_vfs_path_get_name (info->path), ".directory") != 0))
- {
- /* try to query the hints from the .desktop file */
- rc = xfce_rc_simple_open (absolute_path, TRUE);
- if (G_LIKELY (rc != NULL))
- {
- /* we're only interested in the desktop data */
- xfce_rc_set_group (rc, "Desktop Entry");
-
- /* check if we have a valid icon info */
- str = xfce_rc_read_entry_untranslated (rc, "Icon", NULL);
- if (G_LIKELY (str != NULL && *str != '\0'))
- {
- /* setup the custom icon */
- info->custom_icon = g_strdup (str);
-
- /* drop any suffix (e.g. '.png') from themed icons */
- if (!g_path_is_absolute (info->custom_icon))
- {
- p = strrchr (info->custom_icon, '.');
- if (G_UNLIKELY (p != NULL))
- *p = '\0';
- }
- }
-
- /* determine the type of the .desktop file */
- str = xfce_rc_read_entry_untranslated (rc, "Type", "Application");
-
- /* check if the desktop file refers to an application
- * and has a non-NULL Exec field set, or it's a Link
- * with a valid URL field.
- */
- if (G_LIKELY (exo_str_is_equal (str, "Application"))
- && xfce_rc_read_entry (rc, "Exec", NULL) != NULL)
- {
- info->flags |= THUNAR_VFS_FILE_FLAGS_EXECUTABLE;
- }
- else if (G_LIKELY (exo_str_is_equal (str, "Link"))
- && xfce_rc_read_entry (rc, "URL", NULL) != NULL)
- {
- info->flags |= THUNAR_VFS_FILE_FLAGS_EXECUTABLE;
- }
-
- /* check if we have a valid name info */
- name = xfce_rc_read_entry (rc, "Name", NULL);
- if (G_LIKELY (name != NULL && *name != '\0' && g_utf8_validate (name, -1, NULL)))
- {
- /* check if we declared the file as executable */
- if ((info->flags & THUNAR_VFS_FILE_FLAGS_EXECUTABLE) != 0)
- {
- /* if the name contains a dir separator, use only the part after
- * the dir separator for checking.
- */
- str = strrchr (name, G_DIR_SEPARATOR);
- if (G_LIKELY (str == NULL))
- str = (gchar *) name;
- else
- str += 1;
-
- /* check if the file tries to look like a regular document (i.e.
- * a display name of 'file.png'), maybe a virus or other malware.
- */
- fake_mime_info = thunar_vfs_mime_database_get_info_for_name (mime_database, str);
- if (fake_mime_info != mime_application_octet_stream && fake_mime_info != info->mime_info)
- {
- /* release the previous mime info */
- thunar_vfs_mime_info_unref (info->mime_info);
-
- /* set the MIME type of the file to 'x-thunar/suspected-malware' to indicate that
- * it's not safe to trust the file content and execute it or otherwise operate on it.
- */
- info->mime_info = thunar_vfs_mime_database_get_info (mime_database, "x-thunar/suspected-malware");
-
- /* reset the executable flag */
- info->flags &= ~THUNAR_VFS_FILE_FLAGS_EXECUTABLE;
-
- /* reset the custom icon */
- g_free (info->custom_icon);
- info->custom_icon = NULL;
-
- /* reset the name str, so we display the real file name */
- name = NULL;
- }
- thunar_vfs_mime_info_unref (fake_mime_info);
- }
-
- /* check if the name str wasn't reset */
- if (G_LIKELY (name != NULL))
- {
- /* release the previous display name */
- if (G_UNLIKELY (info->display_name != thunar_vfs_path_get_name (info->path)))
- g_free (info->display_name);
-
- /* use the name specified by the .desktop file as display name */
- info->display_name = g_strdup (name);
- }
- }
-
- /* close the file */
- xfce_rc_close (rc);
- }
- }
- break;
-
- default:
- g_assert_not_reached ();
- break;
- }
-
- return info;
+ g_list_foreach (info_list, (GFunc) thunar_vfs_info_unref, NULL);
+ g_list_free (info_list);
}
diff --git a/thunar-vfs/thunar-vfs-info.h b/thunar-vfs/thunar-vfs-info.h
index 52a3412809bbeaa98a664db2bcc005b56d52274c..889ec496dd3f087801a54d9c10518d720689e226 100644
--- a/thunar-vfs/thunar-vfs-info.h
+++ b/thunar-vfs/thunar-vfs-info.h
@@ -31,14 +31,38 @@
G_BEGIN_DECLS;
+/**
+ * ThunarVfsInfoMetadata:
+ * @THUNAR_VFS_INFO_METADATA_FILE_LINK_TARGET : the target of a symbolic link.
+ * @THUNAR_VFS_INFO_METADATA_TRASH_ORIGINAL_PATH : the original path of a trashed resource.
+ * @THUNAR_VFS_INFO_METADATA_TRASH_DELETION_DATE : the deletion date of a trashed resource as date string.
+ *
+ * Metadata categories for thunar_vfs_info_get_metadata().
+ *
+ * Since: 0.3.3
+ **/
+typedef enum /*< skip >*/
+{
+ THUNAR_VFS_INFO_METADATA_FILE_LINK_TARGET = 0,
+ THUNAR_VFS_INFO_METADATA_TRASH_ORIGINAL_PATH = 64,
+ THUNAR_VFS_INFO_METADATA_TRASH_DELETION_DATE = 65,
+} ThunarVfsInfoMetadata;
+
+
+/**
+ * THUNAR_VFS_TYPE_INFO:
+ *
+ * Returns the type if for #ThunarVfsInfo<!---->s, which is
+ * a boxed type.
+ **/
+#define THUNAR_VFS_TYPE_INFO (thunar_vfs_info_get_type ())
+
/* Used to avoid a dependency of thunarx on thunar-vfs */
#ifndef __THUNAR_VFS_INFO_DEFINED__
#define __THUNAR_VFS_INFO_DEFINED__
typedef struct _ThunarVfsInfo ThunarVfsInfo;
#endif
-#define THUNAR_VFS_TYPE_INFO (thunar_vfs_info_get_type ())
-
struct _ThunarVfsInfo
{
/* File type */
@@ -89,36 +113,40 @@ struct _ThunarVfsInfo
GType thunar_vfs_info_get_type (void) G_GNUC_CONST;
-ThunarVfsInfo *thunar_vfs_info_new_for_path (ThunarVfsPath *path,
- GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+ThunarVfsInfo *thunar_vfs_info_new_for_path (ThunarVfsPath *path,
+ GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+G_INLINE_FUNC ThunarVfsInfo *thunar_vfs_info_ref (ThunarVfsInfo *info);
+void thunar_vfs_info_unref (ThunarVfsInfo *info);
-G_INLINE_FUNC ThunarVfsInfo *thunar_vfs_info_ref (ThunarVfsInfo *info);
-void thunar_vfs_info_unref (ThunarVfsInfo *info);
+ThunarVfsInfo *thunar_vfs_info_copy (const ThunarVfsInfo *info) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-ThunarVfsInfo *thunar_vfs_info_copy (const ThunarVfsInfo *info) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+G_INLINE_FUNC const gchar *thunar_vfs_info_get_custom_icon (const ThunarVfsInfo *info) G_GNUC_WARN_UNUSED_RESULT;
-gboolean thunar_vfs_info_get_free_space (const ThunarVfsInfo *info,
- ThunarVfsFileSize *free_space_return);
+gboolean thunar_vfs_info_get_free_space (const ThunarVfsInfo *info,
+ ThunarVfsFileSize *free_space_return) G_GNUC_WARN_UNUSED_RESULT;
-G_INLINE_FUNC const gchar *thunar_vfs_info_get_custom_icon (const ThunarVfsInfo *info);
+gchar *thunar_vfs_info_get_metadata (const ThunarVfsInfo *info,
+ ThunarVfsInfoMetadata metadata,
+ GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gchar *thunar_vfs_info_read_link (const ThunarVfsInfo *info,
- GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+G_INLINE_FUNC gchar *thunar_vfs_info_read_link (const ThunarVfsInfo *info,
+ GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gboolean thunar_vfs_info_execute (const ThunarVfsInfo *info,
- GdkScreen *screen,
- GList *path_list,
- const gchar *working_directory,
- GError **error);
+gboolean thunar_vfs_info_execute (const ThunarVfsInfo *info,
+ GdkScreen *screen,
+ GList *path_list,
+ const gchar *working_directory,
+ GError **error);
-gboolean thunar_vfs_info_rename (ThunarVfsInfo *info,
- const gchar *name,
- GError **error);
+gboolean thunar_vfs_info_rename (ThunarVfsInfo *info,
+ const gchar *name,
+ GError **error);
-gboolean thunar_vfs_info_matches (const ThunarVfsInfo *a,
- const ThunarVfsInfo *b);
+gboolean thunar_vfs_info_matches (const ThunarVfsInfo *a,
+ const ThunarVfsInfo *b) G_GNUC_WARN_UNUSED_RESULT;
-G_INLINE_FUNC void thunar_vfs_info_list_free (GList *info_list);
+void thunar_vfs_info_list_free (GList *info_list);
/* inline functions implementations */
@@ -159,31 +187,29 @@ thunar_vfs_info_get_custom_icon (const ThunarVfsInfo *info)
}
/**
- * thunar_vfs_info_list_free:
- * @info_list : a list of #ThunarVfsInfo<!---->s.
+ * thunar_vfs_info_read_link:
+ * @info : a #ThunarVfsInfo.
+ * @error : return location for errors or %NULL.
*
- * Unrefs all #ThunarVfsInfo<!---->s in @info_list and
- * frees the list itself.
+ * Reads the contents of the symbolic link to which @info refers to,
+ * like the POSIX readlink() function. The returned string is in the
+ * encoding used for filenames.
+ *
+ * The caller is responsible to free the returned string using g_free()
+ * when no longer needed.
+ *
+ * Return value: a newly allocated string with the contents of the
+ * symbolic link, or %NULL if an error occurred.
**/
-G_INLINE_FUNC void
-thunar_vfs_info_list_free (GList *info_list)
+G_INLINE_FUNC gchar*
+thunar_vfs_info_read_link (const ThunarVfsInfo *info,
+ GError **error)
{
- GList *lp;
- for (lp = info_list; lp != NULL; lp = lp->next)
- thunar_vfs_info_unref (lp->data);
- g_list_free (info_list);
+ return thunar_vfs_info_get_metadata (info, THUNAR_VFS_INFO_METADATA_FILE_LINK_TARGET, error);
}
#endif /* G_CAN_INLINE || __THUNAR_VFS_INFO_C__ */
-#if defined(THUNAR_VFS_COMPILATION)
-void _thunar_vfs_info_init (void) G_GNUC_INTERNAL;
-void _thunar_vfs_info_shutdown (void) G_GNUC_INTERNAL;
-ThunarVfsInfo *_thunar_vfs_info_new_internal (ThunarVfsPath *path,
- const gchar *absolute_path,
- GError **error) G_GNUC_INTERNAL;
-#endif
-
G_END_DECLS;
#endif /* !__THUNAR_VFS_INFO_H__ */
diff --git a/thunar-vfs/thunar-vfs-interactive-job.c b/thunar-vfs/thunar-vfs-interactive-job.c
index 9b056bc3f45b65cac148929386eaed0b683c2b36..2f8d6c7702b77aa2dc0c55961664c80363acbf11 100644
--- a/thunar-vfs/thunar-vfs-interactive-job.c
+++ b/thunar-vfs/thunar-vfs-interactive-job.c
@@ -22,43 +22,18 @@
#include <config.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
#include <thunar-vfs/thunar-vfs-enum-types.h>
#include <thunar-vfs/thunar-vfs-interactive-job.h>
-#include <thunar-vfs/thunar-vfs-marshal.h>
#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
-enum
+GType
+thunar_vfs_interactive_job_response_get_type (void)
{
- ASK,
- INFO_MESSAGE,
- NEW_FILES,
- PERCENT,
- LAST_SIGNAL,
-};
-
-
-
-static void thunar_vfs_interactive_job_class_init (ThunarVfsInteractiveJobClass *klass);
-static void thunar_vfs_interactive_job_init (ThunarVfsInteractiveJob *interactive_job);
-static void thunar_vfs_interactive_job_finalize (GObject *object);
-static ThunarVfsInteractiveJobResponse thunar_vfs_interactive_job_real_ask (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message,
- ThunarVfsInteractiveJobResponse choices);
-static ThunarVfsInteractiveJobResponse thunar_vfs_interactive_job_ask (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message,
- ThunarVfsInteractiveJobResponse choices);
-
-
-
-static GObjectClass *thunar_vfs_interactive_job_parent_class;
-static guint interactive_signals[LAST_SIGNAL];
+ return THUNAR_VFS_TYPE_VFS_JOB_RESPONSE;
+}
@@ -72,9 +47,9 @@ thunar_vfs_interactive_job_get_type (void)
type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_JOB,
"ThunarVfsInteractiveJob",
sizeof (ThunarVfsInteractiveJobClass),
- thunar_vfs_interactive_job_class_init,
+ NULL,
sizeof (ThunarVfsInteractiveJob),
- thunar_vfs_interactive_job_init,
+ NULL,
G_TYPE_FLAG_ABSTRACT);
}
@@ -83,350 +58,5 @@ thunar_vfs_interactive_job_get_type (void)
-static gboolean
-ask_accumulator (GSignalInvocationHint *ihint,
- GValue *return_accu,
- const GValue *handler_return,
- gpointer data)
-{
- g_value_copy (handler_return, return_accu);
- return FALSE;
-}
-
-
-
-static void
-thunar_vfs_interactive_job_class_init (ThunarVfsInteractiveJobClass *klass)
-{
- GObjectClass *gobject_class;
-
- /* determine the parent type class */
- thunar_vfs_interactive_job_parent_class = g_type_class_peek_parent (klass);
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = thunar_vfs_interactive_job_finalize;
-
- klass->ask = thunar_vfs_interactive_job_real_ask;
-
- /**
- * ThunarVfsInteractiveJob::ask:
- * @job : a #ThunarVfsJob.
- * @message : question to display to the user.
- * @choices : a combination of #ThunarVfsInteractiveJobResponse<!---->s.
- *
- * The @message is garantied to contain valid UTF-8.
- *
- * Return value: the selected choice.
- **/
- interactive_signals[ASK] =
- g_signal_new (I_("ask"),
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_NO_HOOKS | G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ThunarVfsInteractiveJobClass, ask),
- ask_accumulator, NULL,
- _thunar_vfs_marshal_FLAGS__STRING_FLAGS,
- THUNAR_VFS_TYPE_VFS_INTERACTIVE_JOB_RESPONSE,
- 2, G_TYPE_STRING,
- THUNAR_VFS_TYPE_VFS_INTERACTIVE_JOB_RESPONSE);
-
- /**
- * ThunarVfsInteractiveJob::new-files:
- * @job : a #ThunarVfsJob.
- * @path_list : a list of #ThunarVfsPath<!---->s that were created by @job.
- *
- * This signal is emitted by the @job right before the @job is terminated
- * and informs the application about the list of created files in @path_list.
- * @path_list contains only the toplevel path items, that were specified by
- * the application on creation of the @job.
- **/
- interactive_signals[NEW_FILES] =
- g_signal_new (I_("new-files"),
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_NO_HOOKS, 0, NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1, G_TYPE_POINTER);
-
- /**
- * ThunarVfsInteractiveJob::info-message:
- * @job : a #ThunarVfsJob.
- * @message : information to be displayed about @job.
- *
- * This signal is emitted to display information about the
- * @job. Examples of messages are "Preparing..." or
- * "Cleaning up...".
- *
- * The @message is garantied to contain valid UTF-8, so
- * it can be displayed by #GtkWidget<!---->s out of the
- * box.
- **/
- interactive_signals[INFO_MESSAGE] =
- g_signal_new (I_("info-message"),
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_NO_HOOKS, 0, NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING);
-
- /**
- * ThunarVfsInteractiveJob::percent:
- * @job : a #ThunarVfsJob.
- * @percent : the percentage of completeness.
- *
- * This signal is emitted to present the state
- * of the overall progress.
- **/
- interactive_signals[PERCENT] =
- g_signal_new (I_("percent"),
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_NO_HOOKS, 0, NULL, NULL,
- g_cclosure_marshal_VOID__DOUBLE,
- G_TYPE_NONE, 1, G_TYPE_DOUBLE);
-}
-
-
-
-static void
-thunar_vfs_interactive_job_init (ThunarVfsInteractiveJob *interactive_job)
-{
- /* grab a reference on the default vfs monitor */
- interactive_job->monitor = thunar_vfs_monitor_get_default ();
-}
-
-
-
-static void
-thunar_vfs_interactive_job_finalize (GObject *object)
-{
- ThunarVfsInteractiveJob *interactive_job = THUNAR_VFS_INTERACTIVE_JOB (object);
-
- /* release the reference on the default vfs monitor */
- g_object_unref (G_OBJECT (interactive_job->monitor));
-
- (*G_OBJECT_CLASS (thunar_vfs_interactive_job_parent_class)->finalize) (object);
-}
-
-
-
-static ThunarVfsInteractiveJobResponse
-thunar_vfs_interactive_job_real_ask (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message,
- ThunarVfsInteractiveJobResponse choices)
-{
- return THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL;
-}
-
-
-
-static ThunarVfsInteractiveJobResponse
-thunar_vfs_interactive_job_ask (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message,
- ThunarVfsInteractiveJobResponse choices)
-{
- ThunarVfsInteractiveJobResponse response;
- thunar_vfs_job_emit (THUNAR_VFS_JOB (interactive_job), interactive_signals[ASK], 0, message, choices, &response);
- return response;
-}
-
-
-
-/**
- * thunar_vfs_interactive_job_info_message:
- * @interactive_job : a #ThunarVfsInteractiveJob.
- * @message : an informational message about @interactive_job.
- *
- * Emits the ::info-message signal on @interactive_job with @message.
- *
- * The text contained in @message must be valid UTF-8.
- **/
-void
-thunar_vfs_interactive_job_info_message (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message)
-{
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (interactive_job));
- g_return_if_fail (g_utf8_validate (message, -1, NULL));
-
- thunar_vfs_job_emit (THUNAR_VFS_JOB (interactive_job), interactive_signals[INFO_MESSAGE], 0, message);
-}
-
-
-
-/**
- * thunar_vfs_interactive_job_percent:
- * @interactive_job : a #ThunarVfsInteractiveJob.
- * @percent : the percentage of completeness (in the range of 0.0 to 100.0).
- *
- * Emits the ::percent signal on @interactive_job with @percent.
- **/
-void
-thunar_vfs_interactive_job_percent (ThunarVfsInteractiveJob *interactive_job,
- gdouble percent)
-{
- struct timeval tv;
- guint64 time;
-
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (interactive_job));
- g_return_if_fail (percent >= 0.0 && percent <= 100.0);
-
- /* determine the current time in msecs */
- gettimeofday (&tv, NULL);
- time = tv.tv_sec * 1000 + tv.tv_usec / 1000;
-
- /* don't fire the "percent" signal more than ten times per second
- * to avoid unneccessary load on the main thread.
- */
- if (G_UNLIKELY (time - interactive_job->last_percent_time > 100))
- {
- thunar_vfs_job_emit (THUNAR_VFS_JOB (interactive_job), interactive_signals[PERCENT], 0, percent);
- interactive_job->last_percent_time = time;
- }
-}
-
-
-
-/**
- * thunar_vfs_interactive_job_new_files:
- * @interactive_job : a #ThunarVfsInteractiveJob.
- * @path_list : the #ThunarVfsPath<!---->s that were created by @interactive_job.
- *
- * Emits the ::created signal on @interactive_job with @info_list.
- **/
-void
-thunar_vfs_interactive_job_new_files (ThunarVfsInteractiveJob *interactive_job,
- const GList *path_list)
-{
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (interactive_job));
-
- /* wait for the monitor to process all pending events */
- thunar_vfs_monitor_wait (interactive_job->monitor);
-
- /* emit the new-files signal */
- thunar_vfs_job_emit (THUNAR_VFS_JOB (interactive_job), interactive_signals[NEW_FILES], 0, path_list);
-}
-
-
-
-/**
- * thunar_vfs_interactive_job_overwrite:
- * @interactive_job : a #ThunarVfsInteractiveJob.
- * @message : the message to be displayed in valid UTF-8.
- *
- * Asks the user whether to overwrite a certain file as described by
- * @message.
- *
- * The return value may be %TRUE to perform the overwrite, or %FALSE,
- * which means to either skip the file or cancel the @interactive_job.
- * The caller must check using thunar_vfs_job_cancelled() if %FALSE
- * is returned.
- *
- * Return value: %TRUE to overwrite or %FALSE to leave it or cancel
- * the @interactive_job.
- **/
-gboolean
-thunar_vfs_interactive_job_overwrite (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message)
-{
- ThunarVfsInteractiveJobResponse response;
-
- g_return_val_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (interactive_job), FALSE);
- g_return_val_if_fail (g_utf8_validate (message, -1, NULL), FALSE);
-
- /* check if the user cancelled the job already */
- if (thunar_vfs_job_cancelled (THUNAR_VFS_JOB (interactive_job)))
- return FALSE;
-
- /* check if the user said "overwrite all" earlier */
- if (interactive_job->overwrite_all)
- return TRUE;
-
- /* ask the user */
- response = thunar_vfs_interactive_job_ask (interactive_job, message,
- THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES |
- THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL |
- THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_NO |
- THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
-
- /* evaluate the response */
- switch (response)
- {
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL:
- interactive_job->overwrite_all = TRUE;
- /* FALL-THROUGH */
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES:
- return TRUE;
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL:
- thunar_vfs_job_cancel (THUNAR_VFS_JOB (interactive_job));
- /* FALL-THROUGH */
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_NO:
- return FALSE;
-
- default:
- g_assert_not_reached ();
- return FALSE;
- }
-}
-
-
-
-/**
- * thunar_vfs_interactive_job_skip:
- * @interactive_job : a #ThunarVfsInteractiveJob.
- * @message : the message to be displayed as valid UTF-8.
- *
- * Asks the user whether to skip a certain file as described by
- * @message.
- *
- * The return value may be %TRUE to perform the skip, or %FALSE,
- * which means to cancel the @interactive_job.
- *
- * Return value: %TRUE to overwrite or %FALSE to cancel
- * the @interactive_job.
- **/
-gboolean
-thunar_vfs_interactive_job_skip (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message)
-{
- ThunarVfsInteractiveJobResponse response;
-
- g_return_val_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (interactive_job), FALSE);
- g_return_val_if_fail (g_utf8_validate (message, -1, NULL), FALSE);
-
- /* check if the user cancelled the job already */
- if (thunar_vfs_job_cancelled (THUNAR_VFS_JOB (interactive_job)))
- return FALSE;
-
- /* check if the user said "skip all" earlier */
- if (interactive_job->skip_all)
- return TRUE;
-
- /* ask the user */
- response = thunar_vfs_interactive_job_ask (interactive_job, message,
- THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES |
- THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL |
- THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
-
- /* evaluate the response */
- switch (response)
- {
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL:
- interactive_job->skip_all = TRUE;
- /* FALL-THROUGH */
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES:
- return TRUE;
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL:
- thunar_vfs_job_cancel (THUNAR_VFS_JOB (interactive_job));
- return FALSE;
-
- default:
- g_assert_not_reached ();
- return FALSE;
- }
-}
-
-
-
#define __THUNAR_VFS_INTERACTIVE_JOB_C__
#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-interactive-job.h b/thunar-vfs/thunar-vfs-interactive-job.h
index 8c8be97cf8e7f6cb95c194bc3d1aa80e0a1573b6..912171b5782b22f82de6db1d8c5814b66b1bfc29 100644
--- a/thunar-vfs/thunar-vfs-interactive-job.h
+++ b/thunar-vfs/thunar-vfs-interactive-job.h
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -22,7 +22,6 @@
#define __THUNAR_VFS_INTERACTIVE_JOB_H__
#include <thunar-vfs/thunar-vfs-job.h>
-#include <thunar-vfs/thunar-vfs-monitor.h>
G_BEGIN_DECLS;
@@ -42,8 +41,10 @@ typedef struct _ThunarVfsInteractiveJob ThunarVfsInteractiveJob;
* @THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL :
* @THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_NO :
* @THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL :
+ *
+ * Deprecated: 0.3.3: Use #ThunarVfsJobResponse instead.
**/
-typedef enum /*< flags >*/
+typedef enum /*< skip >*/
{
THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES = 1 << 0,
THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL = 1 << 1,
@@ -51,49 +52,30 @@ typedef enum /*< flags >*/
THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL = 1 << 3,
} ThunarVfsInteractiveJobResponse;
+#define THUNAR_VFS_TYPE_VFS_INTERACTIVE_JOB_RESPONSE (thunar_vfs_interactive_job_response_get_type ())
+GType thunar_vfs_interactive_job_response_get_type (void) G_GNUC_CONST;
+
struct _ThunarVfsInteractiveJobClass
{
- ThunarVfsJobClass __parent__;
-
- /* signals */
- ThunarVfsInteractiveJobResponse (*ask) (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message,
- ThunarVfsInteractiveJobResponse choices);
-
/*< private >*/
+ ThunarVfsJobClass __parent__;
void (*reserved1) (void);
void (*reserved2) (void);
void (*reserved3) (void);
+ void (*reserved4) (void);
};
struct _ThunarVfsInteractiveJob
{
+ /*< private >*/
ThunarVfsJob __parent__;
-
- /* the last time we fired the "percent" signal (in msecs) */
- guint64 last_percent_time;
-
- /* connection to the default ThunarVfsMonitor */
- ThunarVfsMonitor *monitor;
-
- guint overwrite_all : 1;
- guint skip_all : 1;
+ guint64 reserved0; /* backward ABI compatibility */
+ gpointer reserved1;
+ guint reserved2 : 1;
+ guint reserved3 : 1;
};
-GType thunar_vfs_interactive_job_get_type (void) G_GNUC_CONST;
-
-void thunar_vfs_interactive_job_info_message (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message) G_GNUC_INTERNAL;
-void thunar_vfs_interactive_job_percent (ThunarVfsInteractiveJob *interactive_job,
- gdouble percent) G_GNUC_INTERNAL;
-
-void thunar_vfs_interactive_job_new_files (ThunarVfsInteractiveJob *interactive_job,
- const GList *path_list) G_GNUC_INTERNAL;
-
-gboolean thunar_vfs_interactive_job_overwrite (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message) G_GNUC_INTERNAL;
-gboolean thunar_vfs_interactive_job_skip (ThunarVfsInteractiveJob *interactive_job,
- const gchar *message) G_GNUC_INTERNAL;
+GType thunar_vfs_interactive_job_get_type (void) G_GNUC_CONST;
G_END_DECLS;
diff --git a/thunar-vfs/thunar-vfs-io-jobs.c b/thunar-vfs/thunar-vfs-io-jobs.c
new file mode 100644
index 0000000000000000000000000000000000000000..23bb24a6171fc723506ac320c2752663a295f764
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-jobs.c
@@ -0,0 +1,776 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-enum-types.h>
+#include <thunar-vfs/thunar-vfs-info.h>
+#include <thunar-vfs/thunar-vfs-io-jobs.h>
+#include <thunar-vfs/thunar-vfs-io-local.h>
+#include <thunar-vfs/thunar-vfs-io-ops.h>
+#include <thunar-vfs/thunar-vfs-io-scandir.h>
+#include <thunar-vfs/thunar-vfs-io-trash.h>
+#include <thunar-vfs/thunar-vfs-monitor-private.h>
+#include <thunar-vfs/thunar-vfs-private.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+/* use g_chmod(), g_open() and g_stat() on win32 */
+#if defined(G_OS_WIN32)
+#include <glib/gstdio.h>
+#else
+#define g_chmod(path, mode) (chmod ((path), (mode)))
+#define g_open(path, flags, mode) (open ((path), (flags), (mode)))
+#define g_stat(path, statb) (stat ((path), (statb)))
+#endif
+
+
+
+static GList *tvij_collect_nofollow (ThunarVfsJob *job,
+ GList *base_path_list,
+ GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+
+
+static GList*
+tvij_collect_nofollow (ThunarVfsJob *job,
+ GList *base_path_list,
+ GError **error)
+{
+ GError *err = NULL;
+ GList *child_path_list;
+ GList *path_list = NULL;
+ GList *lp;
+
+ /* tell the user that we're preparing to unlink the files */
+ _thunar_vfs_job_info_message (job, _("Preparing..."));
+
+ /* recursively collect the paths */
+ for (lp = base_path_list; err == NULL && lp != NULL && !thunar_vfs_job_cancelled (job); lp = lp->next)
+ {
+ /* try to scan the path as directory */
+ child_path_list = _thunar_vfs_io_scandir (lp->data, &job->cancelled, THUNAR_VFS_IO_SCANDIR_RECURSIVE, &err);
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* we can safely ignore ENOENT/ENOTDIR errors here */
+ if (err->domain == G_FILE_ERROR && (err->code == G_FILE_ERROR_NOENT || err->code == G_FILE_ERROR_NOTDIR))
+ {
+ /* reset the error */
+ g_clear_error (&err);
+ }
+ }
+
+ /* prepend the new paths to the existing list */
+ path_list = thunar_vfs_path_list_prepend (path_list, lp->data);
+ path_list = g_list_concat (child_path_list, path_list);
+ }
+
+ /* check if we failed */
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* release the collected paths */
+ thunar_vfs_path_list_free (path_list);
+
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return NULL;
+ }
+
+ return path_list;
+}
+
+
+
+/**
+ * _thunar_vfs_io_jobs_chmod:
+ * @job : a #ThunarVfsJob.
+ * @param_values : exactly six #GValue with the #GList of #ThunarVfsPath<!---->s
+ * for the files whose mode to changed, the directory mode mask,
+ * the directory mode, the file mask, the file mode and a boolean
+ * flag telling whether to recursively process directories.
+ * @n_param_values : the number of #GValue<!---->s in @param_values, must be exactly
+ * six for this job.
+ * @error : return location for errors or %NULL.
+ *
+ * See thunar_vfs_change_mode() for details.
+ *
+ * The #ThunarVfsPath<!---->s in the first item of @param_values may only include local
+ * paths with scheme %THUNAR_VFS_PATH_SCHEME_FILE.
+ *
+ * Return value: %TRUE if the changing of permissions succeed, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_jobs_chmod (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error)
+{
+ ThunarVfsFileMode file_mask = g_value_get_flags (¶m_values[3]);
+ ThunarVfsFileMode file_mode = g_value_get_flags (¶m_values[4]);
+ ThunarVfsFileMode dir_mask = g_value_get_flags (¶m_values[1]);
+ ThunarVfsFileMode dir_mode = g_value_get_flags (¶m_values[2]);
+ ThunarVfsFileMode mask;
+ ThunarVfsFileMode mode;
+ struct stat statb;
+ gboolean recursive = g_value_get_boolean (¶m_values[5]);
+ GError *err = NULL;
+ GList *path_list = g_value_get_boxed (¶m_values[0]);
+ GList *lp;
+ gchar *absolute_path;
+ gchar *display_name;
+ gint sverrno;
+
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[1], THUNAR_VFS_TYPE_VFS_FILE_MODE), FALSE);
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[2], THUNAR_VFS_TYPE_VFS_FILE_MODE), FALSE);
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[3], THUNAR_VFS_TYPE_VFS_FILE_MODE), FALSE);
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[4], THUNAR_VFS_TYPE_VFS_FILE_MODE), FALSE);
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[0], THUNAR_VFS_TYPE_PATH_LIST), FALSE);
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[5], G_TYPE_BOOLEAN), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
+ _thunar_vfs_return_val_if_fail (n_param_values == 6, FALSE);
+
+#ifdef G_ENABLE_DEBUG
+ /* verify that we have only local paths */
+ for (lp = path_list; lp != NULL; lp = lp->next)
+ _thunar_vfs_assert (_thunar_vfs_path_is_local (lp->data));
+#endif
+
+ /* collect the paths for the chmod operation */
+ path_list = recursive ? tvij_collect_nofollow (job, path_list, &err) : thunar_vfs_path_list_copy (path_list);
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ /* we know the total list of paths to process now */
+ _thunar_vfs_job_total_paths (job, path_list);
+
+ /* change the permissions of all paths */
+ for (lp = path_list; lp != NULL && !thunar_vfs_job_cancelled (job); lp = lp->next)
+ {
+ /* reset the saved errno */
+ sverrno = 0;
+
+ /* update the progress information */
+ _thunar_vfs_job_process_path (job, lp);
+
+ /* try to stat the file */
+ absolute_path = thunar_vfs_path_dup_string (lp->data);
+ if (g_stat (absolute_path, &statb) == 0)
+ {
+ /* different actions depending on the type of the file */
+ mask = S_ISDIR (statb.st_mode) ? dir_mask : file_mask;
+ mode = S_ISDIR (statb.st_mode) ? dir_mode : file_mode;
+
+ /* determine the new mode */
+ mode = ((statb.st_mode & ~mask) | mode) & 07777;
+
+ /* try to apply the new mode */
+ if (g_chmod (absolute_path, mode) < 0)
+ goto sverror;
+
+ /* feed a change notification event */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CHANGED, lp->data);
+ }
+ else
+ {
+sverror:
+ /* save the errno */
+ sverrno = errno;
+ }
+ g_free (absolute_path);
+
+ /* check if we failed (ignoring ENOENT) */
+ if (G_UNLIKELY (sverrno != 0 && sverrno != ENOENT))
+ {
+ /* generate an error */
+ display_name = _thunar_vfs_path_dup_display_name (lp->data);
+ _thunar_vfs_set_g_error_from_errno2 (&err, sverrno, _("Failed to change permissions of \"%s\""), display_name);
+ g_free (display_name);
+
+ /* ask the user whether to skip this one */
+ _thunar_vfs_job_ask_skip (job, "%s", err->message);
+
+ /* reset the error */
+ g_clear_error (&err);
+ }
+ }
+
+ /* release the path list */
+ thunar_vfs_path_list_free (path_list);
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_jobs_chown:
+ * @job : a #ThunarVfsJob.
+ * @param_values : exactly four #GValue with the #GList of #ThunarVfsPath<!---->s
+ * for the files whose ownership to changed, the new user id or %-1,
+ * the new group id or %-1, and a boolean flag telling whether to
+ * recursively process directories.
+ * @n_param_values : the number of #GValue<!---->s in @param_values, must be exactly
+ * four for this job.
+ * @error : return location for errors or %NULL.
+ *
+ * See thunar_vfs_change_group() and thunar_vfs_change_owner() for details.
+ *
+ * The #ThunarVfsPath<!---->s in the first item of @param_values may only include local
+ * paths with scheme %THUNAR_VFS_PATH_SCHEME_FILE.
+ *
+ * Return value: %TRUE if the changing of ownership succeed, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_jobs_chown (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error)
+{
+ struct stat statb;
+ gboolean recursive = g_value_get_boolean (¶m_values[3]);
+ GError *err = NULL;
+ GList *path_list = g_value_get_boxed (¶m_values[0]);
+ GList *lp;
+ gchar *absolute_path;
+ gchar *display_name;
+ gint sverrno;
+ gint uid = g_value_get_int (¶m_values[1]);
+ gint gid = g_value_get_int (¶m_values[2]);
+ gint nuid;
+ gint ngid;
+
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[0], THUNAR_VFS_TYPE_PATH_LIST), FALSE);
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[3], G_TYPE_BOOLEAN), FALSE);
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[1], G_TYPE_INT), FALSE);
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[2], G_TYPE_INT), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
+ _thunar_vfs_return_val_if_fail (uid >= 0 || gid >= 0, FALSE);
+ _thunar_vfs_return_val_if_fail (n_param_values == 4, FALSE);
+
+#ifdef G_ENABLE_DEBUG
+ /* verify that we have only local paths */
+ for (lp = path_list; lp != NULL; lp = lp->next)
+ _thunar_vfs_assert (_thunar_vfs_path_is_local (lp->data));
+#endif
+
+ /* collect the paths for the chown operation */
+ path_list = recursive ? tvij_collect_nofollow (job, path_list, &err) : thunar_vfs_path_list_copy (path_list);
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ /* we know the total list of paths to process now */
+ _thunar_vfs_job_total_paths (job, path_list);
+
+ /* change the ownership of all paths */
+ for (lp = path_list; lp != NULL && !thunar_vfs_job_cancelled (job); lp = lp->next)
+ {
+ /* reset the saved errno */
+ sverrno = 0;
+
+ /* update the progress information */
+ _thunar_vfs_job_process_path (job, lp);
+
+ /* try to stat the file */
+ absolute_path = thunar_vfs_path_dup_string (lp->data);
+ if (g_stat (absolute_path, &statb) == 0)
+ {
+ /* determine the new uid/gid */
+ nuid = (uid < 0) ? statb.st_uid : uid;
+ ngid = (gid < 0) ? statb.st_gid : gid;
+
+ /* try to apply the new ownership */
+ if (chown (absolute_path, nuid, ngid) < 0)
+ goto sverror;
+
+ /* feed a change notification event */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CHANGED, lp->data);
+ }
+ else
+ {
+sverror:
+ /* save the errno */
+ sverrno = errno;
+ }
+ g_free (absolute_path);
+
+ /* check if we failed (ignoring ENOENT) */
+ if (G_UNLIKELY (sverrno != 0 && sverrno != ENOENT))
+ {
+ /* generate an error */
+ display_name = _thunar_vfs_path_dup_display_name (lp->data);
+ _thunar_vfs_set_g_error_from_errno2 (&err, sverrno, G_LIKELY (uid >= 0)
+ ? _("Failed to change file owenr of \"%s\"")
+ : _("Failed to change file group of \"%s\""),
+ display_name);
+ g_free (display_name);
+
+ /* ask the user whether to skip this one */
+ _thunar_vfs_job_ask_skip (job, "%s", err->message);
+
+ /* reset the error */
+ g_clear_error (&err);
+ }
+ }
+
+ /* release the path list */
+ thunar_vfs_path_list_free (path_list);
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_jobs_create:
+ * @job : a #ThunarVfsJob.
+ * @param_values : exactly one #GValue with the #GList of #ThunarVfsPath<!---->s
+ * for which to create new files.
+ * @n_param_values : the number of #GValue<!---->s in @param_values, must be exactly
+ * one for this job.
+ * @error : return location for errors or %NULL.
+ *
+ * Creates empty files for all #ThunarVfsPath<!---->s specified in @param_values.
+ *
+ * The #ThunarVfsPath<!---->s in @param_values may only include local paths with scheme
+ * %THUNAR_VFS_PATH_SCHEME_FILE.
+ *
+ * Return value: %TRUE if the creation of the files succeed, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_jobs_create (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error)
+{
+ ThunarVfsJobResponse overwrite;
+ GError *err = NULL;
+ gchar *absolute_path;
+ gchar *display_name;
+ gchar *message;
+ GList *path_list = g_value_get_boxed (¶m_values[0]);
+ GList *lp;
+ gint fd;
+
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[0], THUNAR_VFS_TYPE_PATH_LIST), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
+ _thunar_vfs_return_val_if_fail (n_param_values == 1, FALSE);
+
+#ifdef G_ENABLE_DEBUG
+ /* verify that we have only local paths */
+ for (lp = path_list; lp != NULL; lp = lp->next)
+ _thunar_vfs_assert (_thunar_vfs_path_is_local (lp->data));
+#endif
+
+ /* we know the total paths to be processed */
+ _thunar_vfs_job_total_paths (job, path_list);
+
+ /* process all paths */
+ for (lp = path_list; err == NULL && lp != NULL && !thunar_vfs_job_cancelled (job); lp = lp->next)
+ {
+ /* update the progress information */
+ _thunar_vfs_job_process_path (job, lp);
+
+ /* determine the absolute path to the path object */
+ absolute_path = thunar_vfs_path_dup_string (lp->data);
+
+again:
+ /* try to create the file at the given path */
+ fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0644);
+ if (G_UNLIKELY (fd < 0))
+ {
+ /* check if the file already exists */
+ if (G_UNLIKELY (errno == EEXIST))
+ {
+ /* ask the user whether to override this path */
+ display_name = _thunar_vfs_path_dup_display_name (lp->data);
+ overwrite = _thunar_vfs_job_ask_overwrite (job, _("The file \"%s\" already exists"), display_name);
+ g_free (display_name);
+
+ /* check if we should overwrite */
+ if (G_UNLIKELY (overwrite == THUNAR_VFS_JOB_RESPONSE_YES))
+ {
+ /* try to remove the file (fail if not possible) */
+ if (_thunar_vfs_io_ops_remove (lp->data, THUNAR_VFS_IO_OPS_IGNORE_ENOENT, &err))
+ {
+ /* try again */
+ goto again;
+ }
+ }
+ }
+ else
+ {
+ /* ask the user whether to skip this path (cancels the job if not) */
+ display_name = _thunar_vfs_path_dup_display_name (lp->data);
+ message = g_strdup_printf (_("Failed to create empty file \"%s\""), display_name);
+ _thunar_vfs_job_ask_skip (job, "%s: %s", message, g_strerror (errno));
+ g_free (display_name);
+ g_free (message);
+ }
+ }
+ else
+ {
+ /* feed a "created" event for the new file */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, lp->data);
+
+ /* close the file */
+ close (fd);
+ }
+
+ /* cleanup */
+ g_free (absolute_path);
+ }
+
+ /* check if we failed */
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ /* emit the "new-files" signal with the given path list */
+ _thunar_vfs_job_new_files (job, path_list);
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_jobs_link:
+ * @job : a #ThunarVfsJob.
+ * @param_values : exactly two #GValue<!---->s with the #GList of #ThunarVfsPath<!---->s
+ * for the source paths and the target paths.
+ * @n_param_values : the number of #GValue<!---->s in @param_values, must be exactly
+ * two for this job.
+ * @error : return location for errors or %NULL.
+ *
+ * Creates symbolic links from all #ThunarVfsPath<!---->s in the first parameter of @param_values
+ * to the corresponding #ThunarVfsPath<!---->s in the second parameter of @param_values.
+ *
+ * The #ThunarVfsPath<!---->s in both @param_values may only include local paths with scheme
+ * %THUNAR_VFS_PATH_SCHEME_FILE.
+ *
+ * Return value: %TRUE if the link were created successfully, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_jobs_link (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error)
+{
+ ThunarVfsJobResponse overwrite;
+ ThunarVfsPath *target_path;
+ GError *err = NULL;
+ GList *source_path_list = g_value_get_boxed (¶m_values[0]);
+ GList *target_path_list = g_value_get_boxed (¶m_values[1]);
+ GList *sp;
+ GList *tp;
+
+ _thunar_vfs_return_val_if_fail (g_list_length (source_path_list) == g_list_length (target_path_list), FALSE);
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[0], THUNAR_VFS_TYPE_PATH_LIST), FALSE);
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[1], THUNAR_VFS_TYPE_PATH_LIST), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
+ _thunar_vfs_return_val_if_fail (n_param_values == 2, FALSE);
+
+ /* we know the total list of paths to process */
+ _thunar_vfs_job_total_paths (job, source_path_list);
+
+ /* process all files */
+ for (sp = source_path_list, tp = target_path_list; err == NULL && sp != NULL; sp = sp->next, tp = tp->next)
+ {
+ /* check if the job was cancelled by the user */
+ if (G_UNLIKELY (thunar_vfs_job_cancelled (job)))
+ break;
+
+ /* update the progress information */
+ _thunar_vfs_job_process_path (job, sp);
+
+again:
+ /* try to perform the symlink operation */
+ if (_thunar_vfs_io_ops_link_file (sp->data, tp->data, &target_path, &err))
+ {
+ /* replace the path on the target path list */
+ thunar_vfs_path_unref (tp->data);
+ tp->data = target_path;
+ }
+ else if (G_LIKELY (err->domain == G_FILE_ERROR && err->code == G_FILE_ERROR_EXIST))
+ {
+ /* ask the user whether we should remove the target first */
+ overwrite = _thunar_vfs_job_ask_overwrite (job, "%s", err->message);
+
+ /* release the error */
+ g_clear_error (&err);
+
+ /* check if we should overwrite the existing file */
+ if (G_LIKELY (overwrite == THUNAR_VFS_JOB_RESPONSE_YES))
+ {
+ /* try to remove the target file (fail if not possible) */
+ if (_thunar_vfs_io_ops_remove (tp->data, THUNAR_VFS_IO_OPS_IGNORE_ENOENT, &err))
+ {
+ /* try again... */
+ goto again;
+ }
+ }
+ }
+ }
+
+ /* check if we failed */
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ /* emit the "new-files" signal for the target paths */
+ _thunar_vfs_job_new_files (job, target_path_list);
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_jobs_listdir:
+ * @job : a #ThunarVfsJob.
+ * @param_values : exactly one #GValue with the #ThunarVfsPath of the folder whose
+ * contents to list.
+ * @n_param_values : the number of #GValue<!---->s in @param_values, must be exactly
+ * one for this job.
+ * @error : return location for errors or %NULL.
+ *
+ * Lists the contents of the folder at the #ThunarVfsPath in @param_values.
+ *
+ * Return value: %TRUE if the folder contents were successfully listed, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_jobs_listdir (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error)
+{
+ ThunarVfsPath *path = g_value_get_boxed (¶m_values[0]);
+ GError *err = NULL;
+ GList *info_list;
+
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[0], THUNAR_VFS_TYPE_PATH), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
+ _thunar_vfs_return_val_if_fail (n_param_values == 1, FALSE);
+
+ /* determine the type of directory to scan */
+ switch (thunar_vfs_path_get_scheme (path))
+ {
+ case THUNAR_VFS_PATH_SCHEME_FILE:
+ info_list = _thunar_vfs_io_local_listdir (path, &err);
+ break;
+
+ case THUNAR_VFS_PATH_SCHEME_TRASH:
+ info_list = _thunar_vfs_io_trash_listdir (path, &err);
+ break;
+
+ default:
+ _thunar_vfs_assert_not_reached ();
+ return FALSE;
+ }
+
+ /* check if we have any files to report */
+ if (G_LIKELY (info_list != NULL))
+ {
+ /* emit the "infos-ready" signal with the given list */
+ if (!_thunar_vfs_job_infos_ready (job, info_list))
+ {
+ /* if none of the handlers took over ownership, we still
+ * own it and we are thereby responsible to release it.
+ */
+ thunar_vfs_info_list_free (info_list);
+ }
+ }
+ else if (err != NULL)
+ {
+ /* propagate the error to the caller */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_jobs_mkdir:
+ * @job : a #ThunarVfsJob.
+ * @param_values : exactly one #GValue with the #GList of #ThunarVfsPath<!---->s
+ * for which to create new directories.
+ * @n_param_values : the number of #GValue<!---->s in @param_values, must be exactly
+ * one for this job.
+ * @error : return location for errors or %NULL.
+ *
+ * Creates new directories for all #ThunarVfsPath<!---->s specified in @param_values.
+ *
+ * The #ThunarVfsPath<!---->s in @param_values may only include local paths with scheme
+ * %THUNAR_VFS_PATH_SCHEME_FILE.
+ *
+ * Return value: %TRUE if the creation of the folders succeed, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_jobs_mkdir (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error)
+{
+ GList *path_list = g_value_get_boxed (¶m_values[0]);
+ GList *lp;
+
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[0], THUNAR_VFS_TYPE_PATH_LIST), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
+ _thunar_vfs_return_val_if_fail (n_param_values == 1, FALSE);
+
+#ifdef G_ENABLE_DEBUG
+ /* verify that we have only local paths */
+ for (lp = path_list; lp != NULL; lp = lp->next)
+ _thunar_vfs_assert (_thunar_vfs_path_is_local (lp->data));
+#endif
+
+ /* we know the total list of paths to process */
+ _thunar_vfs_job_total_paths (job, path_list);
+
+ /* process all directories */
+ for (lp = path_list; lp != NULL && !thunar_vfs_job_cancelled (job); lp = lp->next)
+ {
+ /* update the progress information */
+ _thunar_vfs_job_process_path (job, lp);
+
+ /* try to create the target directory */
+ if (!_thunar_vfs_io_ops_mkdir (lp->data, 0755, THUNAR_VFS_IO_OPS_NONE, error))
+ return FALSE;
+ }
+
+ /* emit the "new-files" signal */
+ _thunar_vfs_job_new_files (job, path_list);
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_jobs_unlink:
+ * @job : a #ThunarVfsJob.
+ * @param_values : exactly one #GValue with the #GList of #ThunarVfsPath<!---->s
+ * for the files and folders which should be unlinked recursively.
+ * @n_param_values : the number of #GValue<!---->s in @param_values, must be exactly
+ * one for this job.
+ * @error : return location for errors or %NULL.
+ *
+ * Recursively unlinks all #ThunarVfsPath<!---->s specified in @param_values.
+ *
+ * Return value: %TRUE if the unlink operation succeed, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_jobs_unlink (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error)
+{
+ GError *err = NULL;
+ GList *path_list;
+ GList *lp;
+
+ _thunar_vfs_return_val_if_fail (G_VALUE_HOLDS (¶m_values[0], THUNAR_VFS_TYPE_PATH_LIST), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
+ _thunar_vfs_return_val_if_fail (n_param_values == 1, FALSE);
+
+ /* collect the paths for the removal */
+ path_list = tvij_collect_nofollow (job, g_value_get_boxed (¶m_values[0]), &err);
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ /* we know the total list of paths to process */
+ _thunar_vfs_job_total_paths (job, path_list);
+
+ /* perform the actual removal of the paths */
+ for (lp = path_list; lp != NULL && !thunar_vfs_job_cancelled (job); lp = lp->next)
+ {
+ /* update the progress information */
+ _thunar_vfs_job_process_path (job, lp);
+
+ /* skip the root folders, which cannot be deleted anyway */
+ if (G_LIKELY (!thunar_vfs_path_is_root (lp->data)))
+ {
+ /* remove the file for the current path */
+ if (!_thunar_vfs_io_ops_remove (lp->data, THUNAR_VFS_IO_OPS_IGNORE_ENOENT, &err))
+ {
+ /* ask the user whether to skip the file */
+ _thunar_vfs_job_ask_skip (job, "%s", err->message);
+
+ /* clear the error */
+ g_clear_error (&err);
+ }
+ }
+ }
+
+ /* release the path list */
+ thunar_vfs_path_list_free (path_list);
+
+ return TRUE;
+}
+
+
+
+#define __THUNAR_VFS_IO_JOBS_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-io-jobs.h b/thunar-vfs/thunar-vfs-io-jobs.h
new file mode 100644
index 0000000000000000000000000000000000000000..1a3cf9f5d0eeb7ebbde08324f21616152c817094
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-jobs.h
@@ -0,0 +1,63 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_IO_JOBS_H__
+#define __THUNAR_VFS_IO_JOBS_H__
+
+#include <thunar-vfs/thunar-vfs-job-private.h>
+
+G_BEGIN_DECLS;
+
+gboolean _thunar_vfs_io_jobs_chmod (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error) G_GNUC_INTERNAL;
+gboolean _thunar_vfs_io_jobs_chown (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error) G_GNUC_INTERNAL;
+gboolean _thunar_vfs_io_jobs_create (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error) G_GNUC_INTERNAL;
+gboolean _thunar_vfs_io_jobs_mkdir (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error) G_GNUC_INTERNAL;
+gboolean _thunar_vfs_io_jobs_link (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error) G_GNUC_INTERNAL;
+gboolean _thunar_vfs_io_jobs_listdir (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error) G_GNUC_INTERNAL;
+gboolean _thunar_vfs_io_jobs_unlink (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error) G_GNUC_INTERNAL;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_IO_JOBS_H__ */
diff --git a/thunar-vfs/thunar-vfs-io-local-xfer.c b/thunar-vfs/thunar-vfs-io-local-xfer.c
new file mode 100644
index 0000000000000000000000000000000000000000..a6fbbe319901ab2c8f16d60b92cd6f6538f0b4fd
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-local-xfer.c
@@ -0,0 +1,613 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-io-local-xfer.h>
+#include <thunar-vfs/thunar-vfs-private.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+/* use g_lstat(), g_mkdir(), g_open() and g_unlink() on win32 */
+#if defined(G_OS_WIN32)
+#include <glib/gstdio.h>
+#else
+#define g_lstat(path, buffer) (lstat ((path), (buffer)))
+#define g_mkdir(path, mode) (mkdir ((path), (mode)))
+#define g_open(path, flags, mode) (open ((path), (flags), (mode)))
+#define g_unlink(path) (unlink ((path)))
+#endif
+
+#ifndef O_NOFOLLOW
+#define O_NOFOLLOW 0
+#endif
+
+
+
+static gboolean tvilx_mounted_readonly (gint fd);
+static void tvilx_set_error_with_path (GError **error,
+ const gchar *message,
+ const gchar *path);
+static inline void tvilx_copy_regular (const gchar *source_absolute_path,
+ const gchar *target_absolute_path,
+ const struct stat *source_statb,
+ ThunarVfsIOOpsProgressCallback callback,
+ gpointer callback_data,
+ GError **error);
+
+
+
+static gboolean
+tvilx_mounted_readonly (gint fd)
+{
+#if defined(HAVE_STATVFS)
+ struct statvfs statvfsb;
+ return (fstatvfs (fd, &statvfsb) == 0 && (statvfsb.f_flag & ST_RDONLY) != 0);
+#elif defined(HAVE_STATFS)
+ struct statfs statfsb;
+ return (fstatfs (fd, &statfsb) == 0 && (statfsb.f_flags & MNT_RDONLY) != 0);
+#else
+ return FALSE;
+#endif
+}
+
+
+
+static void
+tvilx_set_error_with_path (GError **error,
+ const gchar *message,
+ const gchar *path)
+{
+ gchar *display_name;
+ gchar *format;
+ gint sverrno;
+
+ /* save the errno value, as it may be modified */
+ sverrno = errno;
+
+ /* determine the display name for the path */
+ display_name = g_filename_display_name (path);
+
+ /* setup the error */
+ format = g_strconcat (message, " (%s)", NULL);
+ g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (sverrno), format, display_name, g_strerror (sverrno));
+ g_free (format);
+
+ /* release the display name */
+ g_free (display_name);
+}
+
+
+
+static inline void
+tvilx_copy_regular (const gchar *source_absolute_path,
+ const gchar *target_absolute_path,
+ const struct stat *source_statb,
+ ThunarVfsIOOpsProgressCallback callback,
+ gpointer callback_data,
+ GError **error)
+{
+ mode_t mode;
+ gchar *display_name;
+ gchar *buffer;
+ gsize bufsize;
+ gsize completed;
+ gint source_fd;
+ gint target_fd;
+ gint n, m, l;
+
+ /* try to open the source file for reading */
+ source_fd = g_open (source_absolute_path, O_RDONLY, 0000);
+ if (G_UNLIKELY (source_fd < 0))
+ {
+ tvilx_set_error_with_path (error, _("Failed to open \"%s\" for reading"), source_absolute_path);
+ return;
+ }
+
+ /* default to the permissions of the source file */
+ mode = source_statb->st_mode;
+
+ /* if the source is located on a rdonly medium or we are not the owner
+ * of the source file, we automatically chmod +rw the destination file.
+ */
+ if (tvilx_mounted_readonly (source_fd) || source_statb->st_uid != getuid ())
+ mode |= (THUNAR_VFS_FILE_MODE_USR_READ | THUNAR_VFS_FILE_MODE_USR_WRITE);
+
+ /* try to open the target file for writing */
+ target_fd = g_open (target_absolute_path, O_CREAT | O_EXCL | O_NOFOLLOW | O_WRONLY, mode);
+ if (G_UNLIKELY (target_fd < 0))
+ {
+ /* translate EISDIR and EMLINK to EEXIST */
+ if (G_UNLIKELY (errno == EISDIR || errno == EMLINK))
+ errno = EEXIST;
+
+ /* EEXIST gets a better error message */
+ if (G_LIKELY (errno == EEXIST))
+ {
+ display_name = g_filename_display_name (target_absolute_path);
+ g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), _("The file \"%s\" already exists"), display_name);
+ g_free (display_name);
+ }
+ else
+ {
+ /* use the generic error message */
+ tvilx_set_error_with_path (error, _("Failed to open \"%s\" for writing"), target_absolute_path);
+ }
+
+ goto end1;
+ }
+
+#ifdef HAVE_MMAP
+ /* try mmap() for files not larger than 8MB */
+ buffer = (source_statb->st_size <= 8 * 1024 * 1024)
+ ? mmap (NULL, source_statb->st_size, PROT_READ, MAP_SHARED, source_fd, 0)
+ : MAP_FAILED;
+ if (G_LIKELY (buffer != (gchar *) MAP_FAILED))
+ {
+#ifdef HAVE_POSIX_MADVISE
+ /* tell the system that the data will be read sequentially */
+ posix_madvise (buffer, source_statb->st_size, MADV_SEQUENTIAL);
+#endif
+
+ /* write the data to the target file */
+ for (m = 0, n = source_statb->st_size; m < n; )
+ {
+ l = write (target_fd, buffer + m, n - m);
+ if (G_UNLIKELY (l < 0))
+ {
+ /* just try again on EAGAIN/EINTR */
+ if (G_LIKELY (errno != EAGAIN && errno != EINTR))
+ {
+ tvilx_set_error_with_path (error, _("Failed to write data to \"%s\""), target_absolute_path);
+ break;
+ }
+ }
+ else
+ {
+ /* advance the offset */
+ m += l;
+ }
+
+ /* invoke the callback (FALSE means cancel) */
+ if (!((*callback) (m, callback_data)))
+ {
+ /* unlink the (not yet completely written) target file */
+ if (g_unlink (target_absolute_path) < 0)
+ {
+ tvilx_set_error_with_path (error, _("Failed to remove \"%s\""), target_absolute_path);
+ break;
+ }
+
+ /* tell the caller that the job was cancelled */
+ _thunar_vfs_set_g_error_from_errno (error, EINTR);
+ break;
+ }
+ }
+
+ /* need to unmap prior to close */
+ munmap (buffer, source_statb->st_size);
+ }
+ else
+#endif /* !HAVE_MMAP */
+ {
+ /* allocate the transfer buffer */
+ bufsize = 8 * source_statb->st_blksize;
+ buffer = g_new (gchar, bufsize);
+
+ /* copy the data from the source file to the target file */
+ for (completed = 0; completed < source_statb->st_size; )
+ {
+ /* read a chunk from the source file */
+ n = read (source_fd, buffer, bufsize);
+ if (G_UNLIKELY (n < 0))
+ {
+ /* just try again on EAGAIN/EINTR */
+ if (G_LIKELY (errno != EAGAIN && errno != EINTR))
+ {
+ tvilx_set_error_with_path (error, _("Failed to read data from \"%s\""), source_absolute_path);
+ goto end2;
+ }
+ }
+ else if (n == 0)
+ break;
+
+ /* write the data to the target file */
+ for (m = 0; m < n; )
+ {
+ l = write (target_fd, buffer + m, n - m);
+ if (G_UNLIKELY (l < 0))
+ {
+ /* just try again on EAGAIN/EINTR */
+ if (G_UNLIKELY (errno == EAGAIN || errno == EINTR))
+ continue;
+
+ tvilx_set_error_with_path (error, _("Failed to write data to \"%s\""), target_absolute_path);
+ goto end2;
+ }
+ else
+ {
+ /* advance the offset */
+ m += l;
+ }
+ }
+
+ /* invoke the callback (FALSE means cancel) */
+ if (!((*callback) (n, callback_data)))
+ {
+ /* unlink the (not yet completely written) target file */
+ if (g_unlink (target_absolute_path) < 0)
+ {
+ tvilx_set_error_with_path (error, _("Failed to remove \"%s\""), target_absolute_path);
+ goto end2;
+ }
+
+ /* tell the caller that the job was cancelled */
+ _thunar_vfs_set_g_error_from_errno (error, EINTR);
+ goto end2;
+ }
+ }
+
+end2: /* release the transfer buffer */
+ g_free (buffer);
+ }
+
+ /* close the file descriptors */
+ close (target_fd);
+end1:
+ close (source_fd);
+}
+
+
+
+/**
+ * _thunar_vfs_io_local_xfer_next_path:
+ * @source_path : the #ThunarVfsPath of the source file.
+ * @target_directory_path : the #ThunarVfsPath to the target directory.
+ * @n : the current step.
+ * @mode : whether to generate duplicate or link name.
+ * @error : return location for errors or %NULL.
+ *
+ * This method generates the next duplicate/link name for the @source_path
+ * in @target_directory_path.
+ *
+ * The caller is responsible to free the returned #ThunarVfsPath using
+ * thunar_vfs_path_unref() when no longer needed.
+ *
+ * Return value: the @n<!---->th unique #ThunarVfsPath for @source_path in
+ * @target_directory_path according to @mode.
+ **/
+ThunarVfsPath*
+_thunar_vfs_io_local_xfer_next_path (const ThunarVfsPath *source_path,
+ ThunarVfsPath *target_directory_path,
+ guint n,
+ ThunarVfsIOLocalXferMode mode,
+ GError **error)
+{
+ static const gchar * const NAMES[3][2] =
+ {
+ {
+ N_ ("copy of %s"),
+ N_ ("link to %s"),
+ },
+ {
+ N_ ("another copy of %s"),
+ N_ ("another link to %s"),
+ },
+ {
+ N_ ("third copy of %s"),
+ N_ ("third link to %s"),
+ },
+ };
+
+ ThunarVfsPath *target_path;
+ const gchar *source_name;
+ gchar *source_display_name;
+ gchar *target_display_name;
+ gchar *target_name;
+ gchar *swap_name;
+ gchar *tmp_name;
+ guint m;
+
+ _thunar_vfs_return_val_if_fail (n > 0, NULL);
+
+ /* try to determine the display name for the source file (in UTF-8) */
+ source_name = thunar_vfs_path_get_name (source_path);
+ source_display_name = g_filename_to_utf8 (source_name, -1, NULL, NULL, error);
+ if (G_UNLIKELY (source_display_name == NULL))
+ return NULL;
+
+ /* check if the source display name matches one of the NAMES (when copying) */
+ if (G_LIKELY (mode == THUNAR_VFS_IO_LOCAL_XFER_COPY))
+ {
+ /* allocate memory for the new name */
+ tmp_name = g_strdup (source_display_name);
+
+ /* try the NAMES */
+ for (m = 0; m < 3; ++m)
+ if (sscanf (source_display_name, gettext (NAMES[m][THUNAR_VFS_IO_LOCAL_XFER_COPY]), tmp_name) == 1)
+ {
+ /* swap tmp and source display name */
+ swap_name = source_display_name;
+ source_display_name = tmp_name;
+ tmp_name = swap_name;
+ break;
+ }
+
+ /* if we had no match on the NAMES, try the "%uth copy of %s" pattern */
+ if (G_LIKELY (m == 3) && sscanf (source_display_name, _("%uth copy of %s"), &m, tmp_name) == 2)
+ {
+ /* swap tmp and source display name */
+ swap_name = source_display_name;
+ source_display_name = tmp_name;
+ tmp_name = swap_name;
+ }
+
+ /* cleanup */
+ g_free (tmp_name);
+ }
+
+ /* determine the target display name */
+ if (G_LIKELY (n <= 3))
+ target_display_name = g_strdup_printf (gettext (NAMES[n - 1][mode]), source_display_name);
+ else if (mode == THUNAR_VFS_IO_LOCAL_XFER_COPY)
+ target_display_name = g_strdup_printf (ngettext ("%uth copy of %s", "%uth copy of %s", n), n, source_display_name);
+ else
+ target_display_name = g_strdup_printf (ngettext ("%uth link to %s", "%uth link to %s", n), n, source_display_name);
+
+ /* we don't need the source display name anymore */
+ g_free (source_display_name);
+
+ /* try to determine the real target name from the display name */
+ target_name = g_filename_from_utf8 (target_display_name, -1, NULL, NULL, error);
+
+ /* generate the target path */
+ target_path = (target_name != NULL) ? thunar_vfs_path_relative (target_directory_path, target_name) : NULL;
+ g_free (target_display_name);
+ g_free (target_name);
+ return target_path;
+}
+
+
+
+/**
+ * _thunar_vfs_io_local_xfer_copy:
+ * @source_path : the #ThunarVfsPath for the source file.
+ * @target_path : the #ThunarVfsPath for the target location.
+ * @callback : the progress callback function.
+ * @callback_data : data to pass to @callback.
+ * @merge_directories : %TRUE to merge directories, which means that EEXIST is not
+ * returned if a directory should be copied and the directory
+ * int the target location already exists.
+ * @error : return location for errors or %NULL.
+ *
+ * Copies the file from @source_path to @target_path.
+ *
+ * Return value: %TRUE if the file was successfully copied, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_local_xfer_copy (const ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsIOOpsProgressCallback callback,
+ gpointer callback_data,
+ gboolean merge_directories,
+ GError **error)
+{
+ struct stat source_statb;
+ GError *err = NULL;
+ gchar source_absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
+ gchar target_absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
+#ifdef HAVE_SYMLINK
+ gchar *link_target;
+#endif
+
+ /* determine the absolute source and target path */
+ if (G_UNLIKELY (thunar_vfs_path_to_string (source_path, source_absolute_path, sizeof (source_absolute_path), error) < 0
+ || thunar_vfs_path_to_string (target_path, target_absolute_path, sizeof (target_absolute_path), error) < 0))
+ {
+ /* should not happen, but hey... */
+ return FALSE;
+ }
+
+ /* stat the source path */
+ if (g_lstat (source_absolute_path, &source_statb) < 0)
+ {
+ /* unable to stat source file, impossible to copy then */
+ tvilx_set_error_with_path (&err, _("Failed to determine file info for \"%s\""), source_absolute_path);
+ }
+ else
+ {
+ /* perform the appropriate operation */
+ switch ((source_statb.st_mode & S_IFMT) >> 12)
+ {
+ case THUNAR_VFS_FILE_TYPE_DIRECTORY:
+ /* check if the directory exists, or we should not merge */
+ if (!g_file_test (target_absolute_path, G_FILE_TEST_IS_DIR) || !merge_directories)
+ {
+ /* default to the source dir permissions, but make sure that we can write to newly created directories */
+ mode_t target_mode = (source_statb.st_mode & ~S_IFMT) | THUNAR_VFS_FILE_MODE_USR_READ | THUNAR_VFS_FILE_MODE_USR_WRITE;
+
+ /* try to create the directory */
+ if (g_mkdir (target_absolute_path, target_mode) < 0)
+ tvilx_set_error_with_path (&err, _("Failed to create directory \"%s\""), target_absolute_path);
+ }
+ break;
+
+#ifdef HAVE_MKFIFO
+ case THUNAR_VFS_FILE_TYPE_FIFO:
+ if (mkfifo (target_absolute_path, source_statb.st_mode) < 0)
+ {
+ /* TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'. */
+ tvilx_set_error_with_path (&err, _("Failed to create named fifo \"%s\""), target_absolute_path);
+ }
+ break;
+#endif
+
+ case THUNAR_VFS_FILE_TYPE_REGULAR:
+ /* copying regular files requires some more work */
+ tvilx_copy_regular (source_absolute_path, target_absolute_path, &source_statb, callback, callback_data, &err);
+ break;
+
+#ifdef HAVE_SYMLINK
+ case THUNAR_VFS_FILE_TYPE_SYMLINK:
+ /* try to read the link target */
+ link_target = g_file_read_link (source_absolute_path, &err);
+ if (G_LIKELY (link_target != NULL))
+ {
+ /* try to create the symbolic link */
+ if (symlink (link_target, target_absolute_path) < 0)
+ tvilx_set_error_with_path (&err, _("Failed to create symbolic link \"%s\""), target_absolute_path);
+
+ /* apply the file mode which was found for the source */
+#ifdef HAVE_LCHMOD
+ else if (lchmod (target_absolute_path, source_statb.st_mode) < 0)
+ tvilx_set_error_with_path (&err, _("Failed to change permissions of \"%s\""), target_absolute_path);
+#endif
+ }
+ g_free (link_target);
+ break;
+#endif
+
+ default:
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Special files cannot be copied"));
+ break;
+ }
+
+ /* update the progress for all but regular files if we succeed */
+ if (err == NULL && !S_ISREG (source_statb.st_mode))
+ (*callback) (source_statb.st_size, callback_data);
+ }
+
+ /* check if we failed */
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_local_xfer_link:
+ * @source_path : the #ThunarVfsPath to the source file.
+ * @target_path : the #ThunarVfsPath to the target location.
+ * @error : return location for errors or %NULL.
+ *
+ * Creates a new symbolic link in @target_path pointing to the
+ * file at the @source_path.
+ *
+ * Return value: %TRUE if the symlink creation succeed, %FALSE
+ * otherwise.
+ **/
+gboolean
+_thunar_vfs_io_local_xfer_link (const ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ GError **error)
+{
+#ifdef HAVE_SYMLINK
+ struct stat source_statb;
+ GError *err = NULL;
+ gchar source_absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
+ gchar target_absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (source_path), FALSE);
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (target_path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* determine the absolute source and target path */
+ if (G_UNLIKELY (thunar_vfs_path_to_string (source_path, source_absolute_path, sizeof (source_absolute_path), error) < 0
+ || thunar_vfs_path_to_string (target_path, target_absolute_path, sizeof (target_absolute_path), error) < 0))
+ {
+ /* should not happen, but hey... */
+ return FALSE;
+ }
+
+ /* stat the source path */
+ if (g_lstat (source_absolute_path, &source_statb) < 0)
+ {
+ /* the file does not exist, don't try to create a symlink then */
+ tvilx_set_error_with_path (&err, _("Failed to determine file info for \"%s\""), source_absolute_path);
+ }
+ else
+ {
+ /* try to create the symlink */
+ if (err == NULL && symlink (source_absolute_path, target_absolute_path) < 0)
+ tvilx_set_error_with_path (error, _("Failed to create symbolic link \"%s\""), target_absolute_path);
+ }
+
+ /* check if we failed */
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ return TRUE;
+#else
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Symbolic links are not supported"));
+ return FALSE;
+#endif
+}
+
+
+
+#define __THUNAR_VFS_IO_LOCAL_XFER_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-io-local-xfer.h b/thunar-vfs/thunar-vfs-io-local-xfer.h
new file mode 100644
index 0000000000000000000000000000000000000000..1f9742b0db1fa3f6c6d9611663db5229220cef38
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-local-xfer.h
@@ -0,0 +1,65 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_IO_LOCAL_XFER_H__
+#define __THUNAR_VFS_IO_LOCAL_XFER_H__
+
+#include <thunar-vfs/thunar-vfs-io-ops.h>
+
+G_BEGIN_DECLS;
+
+/**
+ * ThunarVfsIOLocalXferMode:
+ * @THUNAR_VFS_IO_LOCAL_XFER_COPY : generate path for copy.
+ * @THUNAR_VFS_IO_LOCAL_XFER_LINK : generate path for link.
+ *
+ * Modi for _thunar_vfs_io_local_xfer_next_path().
+ **/
+typedef enum /*< skip >*/
+{
+ THUNAR_VFS_IO_LOCAL_XFER_COPY,
+ THUNAR_VFS_IO_LOCAL_XFER_LINK,
+} ThunarVfsIOLocalXferMode;
+
+ThunarVfsPath *_thunar_vfs_io_local_xfer_next_path (const ThunarVfsPath *source_path,
+ ThunarVfsPath *target_directory_path,
+ guint n,
+ ThunarVfsIOLocalXferMode mode,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+gboolean _thunar_vfs_io_local_xfer_copy (const ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsIOOpsProgressCallback callback,
+ gpointer callback_data,
+ gboolean merge_directories,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+gboolean _thunar_vfs_io_local_xfer_link (const ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_IO_LOCAL_XFER_H__ */
diff --git a/thunar-vfs/thunar-vfs-io-local.c b/thunar-vfs/thunar-vfs-io-local.c
new file mode 100644
index 0000000000000000000000000000000000000000..9cf33ae30666fb8e81310e8a91d4a7afab99695f
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-local.c
@@ -0,0 +1,989 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-io-local-xfer.h>
+#include <thunar-vfs/thunar-vfs-io-local.h>
+#include <thunar-vfs/thunar-vfs-mime-database-private.h>
+#include <thunar-vfs/thunar-vfs-os.h>
+#include <thunar-vfs/thunar-vfs-private.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+/* Use g_access(), g_lstat(), g_rename() and g_stat() on win32 */
+#if defined(G_OS_WIN32)
+#include <glib/gstdio.h>
+#else
+#define g_access(path, mode) (access ((path), (mode)))
+#define g_lstat(path, statb) (lstat ((path), (statb)))
+#define g_rename(from, to) (rename ((from), (to)))
+#define g_stat(path, statb) (stat ((path), (statb)))
+#endif
+
+/* Use native strlcpy() if available */
+#if defined(HAVE_STRLCPY)
+#define g_strlcpy(dst, src, size) (strlcpy ((dst), (src), (size)))
+#endif
+
+
+
+/**
+ * _thunar_vfs_io_local_get_free_space:
+ * @path : a #ThunarVfsPath for a file:-URI.
+ * @free_space_return : return location for the amount of free space or %NULL.
+ *
+ * Determines the amount of free space available on the volume on which the
+ * file to which @path refers resides. If the system is able to determine the
+ * amount of free space, it will be placed into the location to which
+ * @free_space_return points and %TRUE will be returned, else the function
+ * will return %FALSE indicating that the system is unable to determine the
+ * amount of free space.
+ *
+ * Return value: %TRUE if the amount of free space could be determined, else
+ * %FALSE:
+ **/
+gboolean
+_thunar_vfs_io_local_get_free_space (const ThunarVfsPath *path,
+ ThunarVfsFileSize *free_space_return)
+{
+#if defined(HAVE_STATFS) && !defined(__sgi__) && !defined(__sun__)
+ struct statfs statfsb;
+#elif defined(HAVE_STATVFS)
+ struct statvfs statfsb;
+#endif
+ gboolean succeed;
+ gchar absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (path), FALSE);
+
+ /* determine the absolute local path */
+ if (thunar_vfs_path_to_string (path, absolute_path, sizeof (absolute_path), NULL) < 0)
+ return FALSE;
+
+ /* determine the amount of free space for the mount point */
+#if defined(HAVE_STATFS) && !defined(__sgi__) && !defined(__sun__)
+ succeed = (statfs (absolute_path, &statfsb) == 0); /* the good old BSD way */
+#elif defined(HAVE_STATVFS)
+ succeed = (statvfs (absolute_path, &statfsb) == 0); /* the Linux, IRIX, Solaris way */
+#else
+#error "Add support for your operating system here"
+#endif
+
+ /* return the free space */
+ if (G_LIKELY (succeed && free_space_return != NULL))
+ *free_space_return = (statfsb.f_bavail * statfsb.f_bsize);
+
+ return succeed;
+}
+
+
+
+/**
+ * _thunar_vfs_io_local_get_info:
+ * @path : the #ThunarVfsPath to use for the return info.
+ * @absolute_path : the absolute, local path to the file.
+ * @error : return location for errors or %NULL.
+ *
+ * @absolute_path does not need to be the string representation of the
+ * @path. For example, @path could be a trash path, while @absolute_path
+ * represents the file refered to by @path, but as a local file system
+ * path.
+ *
+ * The caller is responsible to free the returned object using
+ * thunar_vfs_info_unref() when no longer needed.
+ *
+ * Return value: the #ThunarVfsInfo for the file at the @absolute_path
+ * or %NULL in case of an error.
+ **/
+ThunarVfsInfo*
+_thunar_vfs_io_local_get_info (ThunarVfsPath *path,
+ const gchar *absolute_path,
+ GError **error)
+{
+ ThunarVfsMimeInfo *fake_mime_info;
+ ThunarVfsInfo *info;
+ const guchar *s;
+ const gchar *name;
+ const gchar *str;
+ struct stat lsb;
+ struct stat sb;
+ XfceRc *rc;
+ GList *mime_infos;
+ GList *lp;
+ gchar *p;
+
+ _thunar_vfs_return_val_if_fail (g_path_is_absolute (absolute_path), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+ _thunar_vfs_return_val_if_fail (path != NULL, NULL);
+
+ /* try to stat the file */
+ if (G_UNLIKELY (g_lstat (absolute_path, &lsb) < 0))
+ {
+ _thunar_vfs_set_g_error_from_errno (error, errno);
+ return NULL;
+ }
+
+ /* allocate a new info object */
+ info = _thunar_vfs_slice_new (ThunarVfsInfo);
+ info->path = thunar_vfs_path_ref (path);
+ info->ref_count = 1;
+
+ info->custom_icon = NULL;
+
+ /* determine the display name of the file */
+ name = thunar_vfs_path_get_name (path);
+ for (s = (const guchar *) name; *s >= 32 && *s <= 127; ++s)
+ ;
+ if (G_LIKELY (*s == '\0'))
+ {
+ /* we don't need to perform any transformation if
+ * the file contains only valid ASCII characters.
+ */
+ info->display_name = (gchar *) name;
+ }
+ else
+ {
+ /* determine the displayname using various tricks */
+ info->display_name = g_filename_display_name (name);
+
+ /* go on until s reaches the end of the string, as
+ * we need it for the hidden file detection below.
+ */
+ for (; *s != '\0'; ++s)
+ ;
+ }
+
+ /* check whether we have a hidden file here */
+ if ((s - (const guchar *) name) > 1 && (*name == '.' || *(s - 1) == '~'))
+ info->flags = THUNAR_VFS_FILE_FLAGS_HIDDEN;
+ else
+ info->flags = THUNAR_VFS_FILE_FLAGS_NONE;
+
+ /* determine the POSIX file attributes */
+ if (G_LIKELY (!S_ISLNK (lsb.st_mode)))
+ {
+ info->type = (lsb.st_mode & S_IFMT) >> 12;
+ info->mode = lsb.st_mode & 07777;
+ info->uid = lsb.st_uid;
+ info->gid = lsb.st_gid;
+ info->size = lsb.st_size;
+ info->atime = lsb.st_atime;
+ info->ctime = lsb.st_ctime;
+ info->mtime = lsb.st_mtime;
+ info->device = lsb.st_dev;
+ }
+ else
+ {
+ /* whatever comes, we have a symlink here */
+ info->flags |= THUNAR_VFS_FILE_FLAGS_SYMLINK;
+
+ /* check if it's a broken link */
+ if (g_stat (absolute_path, &sb) == 0)
+ {
+ info->type = (sb.st_mode & S_IFMT) >> 12;
+ info->mode = sb.st_mode & 07777;
+ info->uid = sb.st_uid;
+ info->gid = sb.st_gid;
+ info->size = sb.st_size;
+ info->atime = sb.st_atime;
+ info->ctime = sb.st_ctime;
+ info->mtime = sb.st_mtime;
+ info->device = sb.st_dev;
+ }
+ else
+ {
+ info->type = THUNAR_VFS_FILE_TYPE_SYMLINK;
+ info->mode = lsb.st_mode & 07777;
+ info->uid = lsb.st_uid;
+ info->gid = lsb.st_gid;
+ info->size = lsb.st_size;
+ info->atime = lsb.st_atime;
+ info->ctime = lsb.st_ctime;
+ info->mtime = lsb.st_mtime;
+ info->device = lsb.st_dev;
+ }
+ }
+
+ /* check if we can read the file */
+ if ((info->mode & 00444) != 0 && g_access (absolute_path, R_OK) == 0)
+ info->flags |= THUNAR_VFS_FILE_FLAGS_READABLE;
+
+ /* check if we can write to the file */
+ if ((info->mode & 00222) != 0 && g_access (absolute_path, W_OK) == 0)
+ info->flags |= THUNAR_VFS_FILE_FLAGS_WRITABLE;
+
+ /* determine the file's mime type */
+ switch (info->type)
+ {
+ case THUNAR_VFS_FILE_TYPE_PORT:
+ info->mime_info = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "inode/port");
+ break;
+
+ case THUNAR_VFS_FILE_TYPE_DOOR:
+ info->mime_info = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "inode/door");
+ break;
+
+ case THUNAR_VFS_FILE_TYPE_SOCKET:
+ info->mime_info = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "inode/socket");
+ break;
+
+ case THUNAR_VFS_FILE_TYPE_SYMLINK:
+ info->mime_info = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "inode/symlink");
+ break;
+
+ case THUNAR_VFS_FILE_TYPE_BLOCKDEV:
+ info->mime_info = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "inode/blockdevice");
+ break;
+
+ case THUNAR_VFS_FILE_TYPE_DIRECTORY:
+ /* mime type for directories is cached */
+ info->mime_info = thunar_vfs_mime_info_ref (_thunar_vfs_mime_inode_directory);
+
+ /* check if we have the root folder here */
+ if (G_UNLIKELY (absolute_path[0] == G_DIR_SEPARATOR && absolute_path[1] == '\0'))
+ {
+ /* root folder gets a special custom icon... */
+ info->custom_icon = g_strdup ("gnome-dev-harddisk");
+
+ /* ...and a special display name */
+ info->display_name = g_strdup (_("File System"));
+ }
+ break;
+
+ case THUNAR_VFS_FILE_TYPE_CHARDEV:
+ info->mime_info = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "inode/chardevice");
+ break;
+
+ case THUNAR_VFS_FILE_TYPE_FIFO:
+ info->mime_info = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "inode/fifo");
+ break;
+
+ case THUNAR_VFS_FILE_TYPE_REGULAR:
+ /* determine the MIME-type for the regular file */
+ info->mime_info = thunar_vfs_mime_database_get_info_for_file (_thunar_vfs_mime_database, absolute_path, info->display_name);
+
+ /* check if the file is executable (for security reasons
+ * we only allow execution of well known file types).
+ */
+ if ((info->mode & 0444) != 0 && g_access (absolute_path, X_OK) == 0)
+ {
+ mime_infos = thunar_vfs_mime_database_get_infos_for_info (_thunar_vfs_mime_database, info->mime_info);
+ for (lp = mime_infos; lp != NULL; lp = lp->next)
+ {
+ if (lp->data == _thunar_vfs_mime_application_x_executable || lp->data == _thunar_vfs_mime_application_x_shellscript)
+ {
+ info->flags |= THUNAR_VFS_FILE_FLAGS_EXECUTABLE;
+ break;
+ }
+ }
+ thunar_vfs_mime_info_list_free (mime_infos);
+ }
+
+ /* check if we have a .desktop (and NOT a .directory) file here */
+ if (G_UNLIKELY (info->mime_info == _thunar_vfs_mime_application_x_desktop && strcmp (thunar_vfs_path_get_name (path), ".directory") != 0))
+ {
+ /* try to query the hints from the .desktop file */
+ rc = xfce_rc_simple_open (absolute_path, TRUE);
+ if (G_LIKELY (rc != NULL))
+ {
+ /* we're only interested in the desktop data */
+ xfce_rc_set_group (rc, "Desktop Entry");
+
+ /* check if we have a valid icon info */
+ str = xfce_rc_read_entry_untranslated (rc, "Icon", NULL);
+ if (G_LIKELY (str != NULL && *str != '\0'))
+ {
+ /* setup the custom icon */
+ info->custom_icon = g_strdup (str);
+
+ /* drop any suffix (e.g. '.png') from themed icons */
+ if (!g_path_is_absolute (info->custom_icon))
+ {
+ p = strrchr (info->custom_icon, '.');
+ if (G_UNLIKELY (p != NULL))
+ *p = '\0';
+ }
+ }
+
+ /* determine the type of the .desktop file */
+ str = xfce_rc_read_entry_untranslated (rc, "Type", "Application");
+
+ /* check if the desktop file refers to an application
+ * and has a non-NULL Exec field set, or it's a Link
+ * with a valid URL field.
+ */
+ if (G_LIKELY (exo_str_is_equal (str, "Application"))
+ && xfce_rc_read_entry (rc, "Exec", NULL) != NULL)
+ {
+ info->flags |= THUNAR_VFS_FILE_FLAGS_EXECUTABLE;
+ }
+ else if (G_LIKELY (exo_str_is_equal (str, "Link"))
+ && xfce_rc_read_entry (rc, "URL", NULL) != NULL)
+ {
+ info->flags |= THUNAR_VFS_FILE_FLAGS_EXECUTABLE;
+ }
+
+ /* check if we have a valid name info */
+ name = xfce_rc_read_entry (rc, "Name", NULL);
+ if (G_LIKELY (name != NULL && *name != '\0' && g_utf8_validate (name, -1, NULL)))
+ {
+ /* check if we declared the file as executable */
+ if ((info->flags & THUNAR_VFS_FILE_FLAGS_EXECUTABLE) != 0)
+ {
+ /* if the name contains a dir separator, use only the part after
+ * the dir separator for checking.
+ */
+ str = strrchr (name, G_DIR_SEPARATOR);
+ if (G_LIKELY (str == NULL))
+ str = (gchar *) name;
+ else
+ str += 1;
+
+ /* check if the file tries to look like a regular document (i.e.
+ * a display name of 'file.png'), maybe a virus or other malware.
+ */
+ fake_mime_info = thunar_vfs_mime_database_get_info_for_name (_thunar_vfs_mime_database, str);
+ if (fake_mime_info != _thunar_vfs_mime_application_octet_stream && fake_mime_info != info->mime_info)
+ {
+ /* release the previous mime info */
+ thunar_vfs_mime_info_unref (info->mime_info);
+
+ /* set the MIME type of the file to 'x-thunar/suspected-malware' to indicate that
+ * it's not safe to trust the file content and execute it or otherwise operate on it.
+ */
+ info->mime_info = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "x-thunar/suspected-malware");
+
+ /* reset the executable flag */
+ info->flags &= ~THUNAR_VFS_FILE_FLAGS_EXECUTABLE;
+
+ /* reset the custom icon */
+ g_free (info->custom_icon);
+ info->custom_icon = NULL;
+
+ /* reset the name str, so we display the real file name */
+ name = NULL;
+ }
+ thunar_vfs_mime_info_unref (fake_mime_info);
+ }
+
+ /* check if the name str wasn't reset */
+ if (G_LIKELY (name != NULL))
+ {
+ /* release the previous display name */
+ if (G_UNLIKELY (info->display_name != thunar_vfs_path_get_name (path)))
+ g_free (info->display_name);
+
+ /* use the name specified by the .desktop file as display name */
+ info->display_name = g_strdup (name);
+ }
+ }
+
+ /* close the file */
+ xfce_rc_close (rc);
+ }
+ }
+ break;
+
+ default:
+ _thunar_vfs_assert_not_reached ();
+ break;
+ }
+
+ return info;
+}
+
+
+
+/**
+ * _thunar_vfs_io_local_get_metadata:
+ * @path : a #ThunarVfsPath to a local file.
+ * @metadata : a #ThunarVfsInfoMetadata.
+ * @error : return location for errors or %NULL.
+ *
+ * Returns the @metadata for the @path, which must be a local
+ * path, or %NULL if the @metadata is not available for the
+ * @path.
+ *
+ * The caller is responsible to free the returned string using
+ * g_free() when no longer needed.
+ *
+ * Return value: the @metadata for @path or %NULL.
+ **/
+gchar*
+_thunar_vfs_io_local_get_metadata (ThunarVfsPath *path,
+ ThunarVfsInfoMetadata metadata,
+ GError **error)
+{
+ gchar *absolute_path;
+ gchar *result = NULL;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (path), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* check the type of metadata we're interested in */
+ switch (metadata)
+ {
+ case THUNAR_VFS_INFO_METADATA_FILE_LINK_TARGET:
+ /* read the link target of the file */
+ absolute_path = thunar_vfs_path_dup_string (path);
+ result = g_file_read_link (absolute_path, error);
+ g_free (absolute_path);
+ break;
+
+ default:
+ _thunar_vfs_set_g_error_from_errno (error, EINVAL);
+ break;
+ }
+
+ return result;
+}
+
+
+
+/**
+ * _thunar_vfs_io_local_listdir:
+ * @path : the path to the local directory to list its contents.
+ * @error : return location for errors or %NULL.
+ *
+ * Scans the folder pointed to by the specified @path and returns the list of
+ * #ThunarVfsInfo<!---->s for the files and folders in @path.
+ *
+ * The caller is responsible to free the returned list of #ThunarVfsInfo<!---->s
+ * using thunar_vfs_info_list_free() when no longer needed.
+ *
+ * Return value: a #GList of #ThunarVfsInfo<!---->s for the items in the local
+ * folder pointed to by @path. May be %NULL in case of an error,
+ * while on the other hand, %NULL may also indicate that the
+ * folder contains no files.
+ **/
+GList*
+_thunar_vfs_io_local_listdir (ThunarVfsPath *path,
+ GError **error)
+{
+ ThunarVfsInfo *info;
+ gchar absolute_path[THUNAR_VFS_PATH_MAXSTRLEN + 128];
+ GList *list;
+ GList *sp;
+ GList *tp;
+ gint n;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (path), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* try to determine the absolute path to the folder */
+ n = thunar_vfs_path_to_string (path, absolute_path, THUNAR_VFS_PATH_MAXSTRLEN, error);
+ if (G_UNLIKELY (n < 0))
+ return NULL;
+
+ /* try to scan the specified directory */
+ list = _thunar_vfs_os_scandir (path, absolute_path, TRUE, NULL, error);
+ if (G_UNLIKELY (list == NULL))
+ return NULL;
+
+ /* append a dir separator to the absolute path */
+ absolute_path[n - 1] = G_DIR_SEPARATOR;
+
+ /* associate file infos with the paths in the folder */
+ for (sp = tp = list; sp != NULL; sp = sp->next)
+ {
+ /* generate the absolute path to the file, relative to the folder path */
+ g_strlcpy (absolute_path + n, thunar_vfs_path_get_name (sp->data), sizeof (absolute_path) - n);
+
+ /* try to determine the file info */
+ info = _thunar_vfs_io_local_get_info (sp->data, absolute_path, NULL);
+
+ /* replace the path with the info on the list */
+ if (G_LIKELY (info != NULL))
+ {
+ /* just decrease the ref_count on path (info holds a reference now) */
+ _thunar_vfs_path_unref_nofree (sp->data);
+
+ /* add the info to the list */
+ tp->data = info;
+ tp = tp->next;
+ }
+ else
+ {
+ /* no info, may need to free the path */
+ thunar_vfs_path_unref (sp->data);
+ }
+ }
+
+ /* release the not-filled list items (only non-NULL in case of an info error) */
+ if (G_UNLIKELY (tp != NULL))
+ {
+ if (G_LIKELY (tp->prev != NULL))
+ tp->prev->next = NULL;
+ else
+ list = NULL;
+ g_list_free (tp);
+ }
+
+ return list;
+}
+
+
+
+/**
+ * _thunar_vfs_io_local_copy_file:
+ * @source_path : the #ThunarVfsPath to the source file.
+ * @target_path : the #ThunarVfsPath to the target location.
+ * @target_path_return : the final #ThunarVfsPath of the target location, which may be
+ * different than the @target_path.
+ * @callback : the progress callback, invoked whenever a new chunk of data is copied.
+ * @callback_data : additional data to pass to @callback.
+ * @error : return location for errors or %NULL.
+ *
+ * Copies the file at the @source_path to the location specified by the
+ * @target_path. If @source_path and @target_path are equal a new target
+ * file name is choosen automatically, which indicates that its a copy of
+ * an existing file.
+ *
+ * The final target path, which may be different than @target_path, is
+ * placed in the location pointed to by @target_path_return. The caller
+ * is responsible to free the object using thunar_vfs_path_unref().
+ * @target_path_return will only be set if %TRUE is returned.
+ *
+ * As a special case, if @callback returns %FALSE (which means the
+ * operation should be cancelled), this method returns %FALSE and
+ * @error is set to #G_FILE_ERROR_INTR.
+ *
+ * Return value: %TRUE if the file was successfully copied, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_local_copy_file (const ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ ThunarVfsIOOpsProgressCallback callback,
+ gpointer callback_data,
+ GError **error)
+{
+ ThunarVfsPath *path;
+ GError *err = NULL;
+ guint n;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (source_path), FALSE);
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (target_path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (target_path_return != NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (callback != NULL, FALSE);
+
+ /* check if source and target are the same */
+ if (G_LIKELY (!thunar_vfs_path_equal (source_path, target_path)))
+ {
+ /* not the same, just a simple copy operation */
+ if (_thunar_vfs_io_local_xfer_copy (source_path, target_path, callback, callback_data, TRUE, error))
+ {
+ /* target path didn't change */
+ *target_path_return = thunar_vfs_path_ref (target_path);
+ return TRUE;
+ }
+ return FALSE;
+ }
+
+ /* generate a duplicate name for the target path */
+ for (n = 1;; ++n)
+ {
+ /* try to generate the next duplicate path */
+ path = _thunar_vfs_io_local_xfer_next_path (source_path, target_path->parent, n, THUNAR_VFS_IO_LOCAL_XFER_COPY, &err);
+ if (G_UNLIKELY (path == NULL))
+ goto error;
+
+ /* try to copy to the duplicate file */
+ if (_thunar_vfs_io_local_xfer_copy (source_path, path, callback, callback_data, FALSE, &err))
+ {
+ /* return the generated target path */
+ *target_path_return = path;
+ return TRUE;
+ }
+
+ /* release the generated path */
+ thunar_vfs_path_unref (path);
+
+ /* check if we cannot continue */
+ if (err->domain != G_FILE_ERROR || err->code != G_FILE_ERROR_EXIST)
+ {
+error: /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ /* and once again... */
+ g_clear_error (&err);
+ }
+
+ /* we never get here */
+ _thunar_vfs_assert_not_reached ();
+ return FALSE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_local_link_file:
+ * @source_path : the #ThunarVfsPath to the source file.
+ * @target_path : the #ThunarVfsPath to the target file.
+ * @target_path_return : return location for the final target path or %NULL.
+ * @error : return location for errors or %NULL.
+ *
+ * The final target path, which may be different than @target_path, is placed in
+ * the location pointed to by @target_path_return. The caller is responsible to
+ * free the object using thunar_vfs_path_unref(). @target_path_return will only
+ * be set if %TRUE is returned.
+ *
+ * Return value: %FALSE if @error is set, else %TRUE.
+ **/
+gboolean
+_thunar_vfs_io_local_link_file (const ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ GError **error)
+{
+ ThunarVfsPath *path;
+ GError *err = NULL;
+ guint n;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (source_path), FALSE);
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (target_path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (target_path_return != NULL, FALSE);
+
+ /* check if source and target are the same */
+ if (G_LIKELY (!thunar_vfs_path_equal (source_path, target_path)))
+ {
+ /* source and target aren't the same, just create the link */
+ if (_thunar_vfs_io_local_xfer_link (source_path, target_path, error))
+ {
+ *target_path_return = thunar_vfs_path_ref (target_path);
+ return TRUE;
+ }
+ return FALSE;
+ }
+
+ /* generate a new link name for the target path */
+ for (n = 1;; ++n)
+ {
+ /* try to generate the next link path */
+ path = _thunar_vfs_io_local_xfer_next_path (source_path, target_path->parent, n, THUNAR_VFS_IO_LOCAL_XFER_LINK, &err);
+ if (G_UNLIKELY (path == NULL))
+ goto error;
+
+ {
+ }
+
+ /* try to symlink to the new file */
+ if (_thunar_vfs_io_local_xfer_link (source_path, path, &err))
+ {
+ /* return the generated target path */
+ *target_path_return = path;
+ return TRUE;
+ }
+
+ /* release the generated path */
+ thunar_vfs_path_unref (path);
+
+ /* check if we cannot continue */
+ if (err->domain != G_FILE_ERROR || err->code != G_FILE_ERROR_EXIST)
+ {
+error: /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ /* and once again... */
+ g_clear_error (&err);
+ }
+
+ /* we never get here */
+ _thunar_vfs_assert_not_reached ();
+ return FALSE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_local_move_file:
+ * @source_path : the #ThunarVfsPath to the source file.
+ * @target_path : the #ThunarVfsPath to the target file.
+ * @error : return location for errors or %NULL.
+ *
+ * Moves the file at the @source_path to the @target_path.
+ *
+ * Return value: %TRUE if the file at the @source_path was
+ * successfully moved to @target_path, %FALSE
+ * otherwise.
+ **/
+gboolean
+_thunar_vfs_io_local_move_file (const ThunarVfsPath *source_path,
+ const ThunarVfsPath *target_path,
+ GError **error)
+{
+ gboolean succeed;
+ gchar *source_absolute_path;
+ gchar *target_absolute_path;
+
+ /* make sure that the target path does not already exist */
+ target_absolute_path = thunar_vfs_path_dup_string (target_path);
+ succeed = (g_access (target_absolute_path, F_OK) < 0);
+ if (G_LIKELY (succeed))
+ {
+ /* try to rename the source file to the target path */
+ source_absolute_path = thunar_vfs_path_dup_string (source_path);
+ succeed = (g_rename (source_absolute_path, target_absolute_path) == 0);
+ if (G_UNLIKELY (!succeed))
+ {
+ /* we cannot perform the rename */
+ _thunar_vfs_set_g_error_from_errno (error, errno);
+ }
+ g_free (source_absolute_path);
+ }
+ else
+ {
+ /* we don't want to override files w/o warning */
+ _thunar_vfs_set_g_error_from_errno (error, EEXIST);
+ }
+ g_free (target_absolute_path);
+
+ return succeed;
+}
+
+
+
+/**
+ * _thunar_vfs_io_local_rename:
+ * @info : a #ThunarVfsInfo for a local file.
+ * @name : the new file name in UTF-8 encoding.
+ * @error : return location for errors or %NULL.
+ *
+ * Tries to rename the file referred to by @info to the
+ * new @name.
+ *
+ * The rename operation is smart in that it checks the
+ * type of @info first, and if @info refers to a
+ * <filename>.desktop</filename> file, the file name
+ * won't be touched, but instead the <literal>Name</literal>
+ * field of the <filename>.desktop</filename> will be
+ * changed to @name. Else, if @info refers to a regular
+ * file or directory, the file will be given a new
+ * name.
+ *
+ * Return value: %TRUE on success, else %FALSE.
+ **/
+gboolean
+_thunar_vfs_io_local_rename (ThunarVfsInfo *info,
+ const gchar *name,
+ GError **error)
+{
+ const gchar * const *locale;
+ ThunarVfsMimeInfo *mime_info;
+ GKeyFile *key_file;
+ gsize data_length;
+ gchar *data;
+ gchar *key;
+ gchar src_path[PATH_MAX + 1];
+ gchar *dir_name;
+ gchar *dst_name;
+ gchar *dst_path;
+ FILE *fp;
+
+ _thunar_vfs_return_val_if_fail (*name != '\0' && strchr (name, G_DIR_SEPARATOR) == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (info->path), FALSE);
+ _thunar_vfs_return_val_if_fail (g_utf8_validate (name, -1, NULL), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* determine the source path */
+ if (thunar_vfs_path_to_string (info->path, src_path, sizeof (src_path), error) < 0)
+ return FALSE;
+
+ /* check if we have a .desktop (and NOT a .directory) file here */
+ if (G_UNLIKELY (info->mime_info == _thunar_vfs_mime_application_x_desktop && strcmp (thunar_vfs_path_get_name (info->path), ".directory") != 0))
+ {
+ /* try to open the .desktop file */
+ key_file = g_key_file_new ();
+ if (!g_key_file_load_from_file (key_file, src_path, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, error))
+ {
+error0:
+ g_key_file_free (key_file);
+ return FALSE;
+ }
+
+ /* check if the file is valid */
+ if (G_UNLIKELY (!g_key_file_has_group (key_file, "Desktop Entry")))
+ {
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Invalid desktop file"));
+ goto error0;
+ }
+
+ /* save the new name (localized if required) */
+ for (locale = g_get_language_names (); *locale != NULL; ++locale)
+ {
+ key = g_strdup_printf ("Name[%s]", *locale);
+ if (g_key_file_has_key (key_file, "Desktop Entry", key, NULL))
+ {
+ g_key_file_set_string (key_file, "Desktop Entry", key, name);
+ g_free (key);
+ break;
+ }
+ g_free (key);
+ }
+
+ /* fallback to unlocalized name */
+ if (G_UNLIKELY (*locale == NULL))
+ g_key_file_set_string (key_file, "Desktop Entry", "Name", name);
+
+ /* serialize the key file to a buffer */
+ data = g_key_file_to_data (key_file, &data_length, error);
+ g_key_file_free (key_file);
+ if (G_UNLIKELY (data == NULL))
+ return FALSE;
+
+ /* try to open the file for writing */
+ fp = fopen (src_path, "w");
+ if (G_UNLIKELY (fp == NULL))
+ {
+ _thunar_vfs_set_g_error_from_errno (error, errno);
+error1:
+ g_free (data);
+ return FALSE;
+ }
+
+ /* write the data back to the file */
+ if (fwrite (data, data_length, 1, fp) != 1)
+ {
+ _thunar_vfs_set_g_error_from_errno (error, errno);
+ fclose (fp);
+ goto error1;
+ }
+
+ /* close the file */
+ fclose (fp);
+
+ /* release the previous display name */
+ if (G_LIKELY (info->display_name != thunar_vfs_path_get_name (info->path)))
+ g_free (info->display_name);
+
+ /* apply the new display name */
+ info->display_name = g_strdup (name);
+
+ /* clean up */
+ g_free (data);
+ }
+ else
+ {
+ /* convert the destination file to local encoding */
+ dst_name = g_filename_from_utf8 (name, -1, NULL, NULL, error);
+ if (G_UNLIKELY (dst_name == NULL))
+ return FALSE;
+
+ /* determine the destination path */
+ dir_name = g_path_get_dirname (src_path);
+ dst_path = g_build_filename (dir_name, dst_name, NULL);
+ g_free (dst_name);
+ g_free (dir_name);
+
+ /* verify that the rename target does not already exist */
+ if (G_UNLIKELY (g_file_test (dst_path, G_FILE_TEST_EXISTS)))
+ {
+ /* tell the user that the file already exists */
+ errno = EEXIST;
+error2:
+ _thunar_vfs_set_g_error_from_errno (error, errno);
+ g_free (dst_path);
+ return FALSE;
+ }
+
+ /* perform the rename */
+ if (G_UNLIKELY (g_rename (src_path, dst_path) < 0))
+ goto error2;
+
+ /* update the info's display name */
+ if (info->display_name != thunar_vfs_path_get_name (info->path))
+ g_free (info->display_name);
+ info->display_name = g_strdup (name);
+
+ /* check if this is a hidden file now */
+ if (strlen (name) > 1 && (g_str_has_prefix (name, ".") || g_str_has_prefix (name, "~")))
+ info->flags |= THUNAR_VFS_FILE_FLAGS_HIDDEN;
+ else
+ info->flags &= ~THUNAR_VFS_FILE_FLAGS_HIDDEN;
+
+ /* update the info's path */
+ thunar_vfs_path_unref (info->path);
+ info->path = thunar_vfs_path_new (dst_path, NULL);
+
+ /* if we have a regular file here, then we'll need to determine
+ * the mime type again, as it may be based on the file name
+ */
+ if (G_LIKELY (info->type == THUNAR_VFS_FILE_TYPE_REGULAR))
+ {
+ mime_info = info->mime_info;
+ info->mime_info = thunar_vfs_mime_database_get_info_for_file (_thunar_vfs_mime_database, dst_path, info->display_name);
+ thunar_vfs_mime_info_unref (mime_info);
+ }
+
+ /* clean up */
+ g_free (dst_path);
+ }
+
+ return TRUE;
+}
+
+
+
+#define __THUNAR_VFS_IO_LOCAL_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-io-local.h b/thunar-vfs/thunar-vfs-io-local.h
new file mode 100644
index 0000000000000000000000000000000000000000..b6c2be6da8af03ae766598e2f668b31cfeebaf39
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-local.h
@@ -0,0 +1,63 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_IO_LOCAL_H__
+#define __THUNAR_VFS_IO_LOCAL_H__
+
+#include <thunar-vfs/thunar-vfs-info.h>
+#include <thunar-vfs/thunar-vfs-io-ops.h>
+
+G_BEGIN_DECLS;
+
+gboolean _thunar_vfs_io_local_get_free_space (const ThunarVfsPath *path,
+ ThunarVfsFileSize *free_space_return) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+ThunarVfsInfo *_thunar_vfs_io_local_get_info (ThunarVfsPath *path,
+ const gchar *absolute_path,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar *_thunar_vfs_io_local_get_metadata (ThunarVfsPath *path,
+ ThunarVfsInfoMetadata metadata,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+GList *_thunar_vfs_io_local_listdir (ThunarVfsPath *path,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_local_copy_file (const ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ ThunarVfsIOOpsProgressCallback callback,
+ gpointer callback_data,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_local_link_file (const ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_local_move_file (const ThunarVfsPath *source_path,
+ const ThunarVfsPath *target_path,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_local_rename (ThunarVfsInfo *info,
+ const gchar *name,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_IO_LOCAL_H__ */
diff --git a/thunar-vfs/thunar-vfs-io-ops.c b/thunar-vfs/thunar-vfs-io-ops.c
new file mode 100644
index 0000000000000000000000000000000000000000..6481f8b64193a77ccb88e16861c96324c67ec535
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-ops.c
@@ -0,0 +1,508 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-io-local.h>
+#include <thunar-vfs/thunar-vfs-io-ops.h>
+#include <thunar-vfs/thunar-vfs-io-trash.h>
+#include <thunar-vfs/thunar-vfs-monitor-private.h>
+#include <thunar-vfs/thunar-vfs-private.h>
+#include <thunar-vfs/thunar-vfs-thumb-private.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+/* Use g_lstat(), g_mkdir() and g_remove() on win32 */
+#if defined(G_OS_WIN32)
+#include <glib/gstdio.h>
+#else
+#define g_lstat(path, statb) (lstat ((path), (statb)))
+#define g_mkdir(path, mode) (mkdir ((path), (mode)))
+#define g_remove(path) (remove ((path)))
+#endif
+
+
+
+static void tvio_set_g_error_with_paths (GError **error,
+ const gchar *format,
+ ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ GError *err);
+
+
+
+static void
+tvio_set_g_error_with_paths (GError **error,
+ const gchar *format,
+ ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ GError *err)
+{
+ gchar *source_display_name;
+ gchar *target_display_name;
+ gchar *s;
+
+ /* determine a displayable variant of the source_path */
+ s = _thunar_vfs_path_is_local (source_path) ? thunar_vfs_path_dup_string (source_path) : thunar_vfs_path_dup_uri (source_path);
+ source_display_name = g_filename_display_name (s);
+ g_free (s);
+
+ /* determine a displayable variant of the target_path */
+ s = _thunar_vfs_path_is_local (target_path) ? thunar_vfs_path_dup_string (target_path) : thunar_vfs_path_dup_uri (target_path);
+ target_display_name = g_filename_display_name (s);
+ g_free (s);
+
+ /* generate a useful error message */
+ s = g_strdup_printf (format, source_display_name, target_display_name);
+ g_set_error (error, err->domain, err->code, "%s: %s", s, err->message);
+ g_free (s);
+
+ /* cleanup */
+ g_free (target_display_name);
+ g_free (source_display_name);
+}
+
+
+
+/**
+ * _thunar_vfs_io_ops_get_file_size_and_type:
+ * @path : the #ThunarVfsPath to the file whose size and type
+ * to determine.
+ * @size_return : return location for the file size or %NULL.
+ * @type_return : return location for the file type or %NULL.
+ * @error : return location for errors or %NULL.
+ *
+ * Determines the size and type of the file at @path.
+ *
+ * Return value: %TRUE if the size and type was determined successfully,
+ * %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_ops_get_file_size_and_type (ThunarVfsPath *path,
+ ThunarVfsFileSize *size_return,
+ ThunarVfsFileType *type_return,
+ GError **error)
+{
+ struct stat statb;
+ gboolean succeed = FALSE;
+ gchar *absolute_path;
+ gchar *uri;
+
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* determine the absolute local path for the path object */
+ absolute_path = _thunar_vfs_path_translate_dup_string (path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_LIKELY (absolute_path != NULL))
+ {
+ /* determine the file info for the absolute path */
+ succeed = (g_lstat (absolute_path, &statb) == 0);
+ if (G_LIKELY (succeed))
+ {
+ /* return size and type if requested */
+ if (G_LIKELY (size_return != NULL))
+ *size_return = statb.st_size;
+ if (G_LIKELY (type_return != NULL))
+ *type_return = (statb.st_mode & S_IFMT) >> 12;
+ }
+ else
+ {
+ /* generate a useful error message */
+ uri = thunar_vfs_path_dup_uri (path);
+ _thunar_vfs_set_g_error_from_errno2 (error, errno, _("Failed to determine file info for \"%s\""), uri);
+ g_free (uri);
+ }
+
+ /* cleanup */
+ g_free (absolute_path);
+ }
+
+ return succeed;
+}
+
+
+
+/**
+ * _thunar_vfs_io_ops_copy_file:
+ * @source_path : the #ThunarVfsPath to the source file.
+ * @target_path : the #ThunarVfsPath to the target location.
+ * @target_path_return : the final #ThunarVfsPath of the target location, which may be
+ * different than the @target_path.
+ * @callback : the progress callback, invoked whenever a new chunk of data is copied.
+ * @callback_data : additional data to pass to @callback.
+ * @error : return location for errors or %NULL.
+ *
+ * Copies the file at the @source_path to the location specified by the
+ * @target_path. The final target location will be returned in @target_path_return.
+ *
+ * As a special case, if @callback returns %FALSE, the operation will be cancelled
+ * and an @error with %G_FILE_ERROR and %G_FILE_ERROR_INTR will be returned.
+ *
+ * Return value: %TRUE if the file was successfully copied, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_ops_copy_file (ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ ThunarVfsIOOpsProgressCallback callback,
+ gpointer callback_data,
+ GError **error)
+{
+ gboolean succeed;
+ GError *err = NULL;
+
+ _thunar_vfs_return_val_if_fail (!thunar_vfs_path_is_root (source_path), FALSE);
+ _thunar_vfs_return_val_if_fail (!thunar_vfs_path_is_root (target_path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (callback != NULL, FALSE);
+
+ /* check if either source or target is trash */
+ if (_thunar_vfs_path_is_trash (source_path) || _thunar_vfs_path_is_trash (target_path))
+ {
+ /* copy to or from the trash may result in a new target path */
+ succeed = _thunar_vfs_io_trash_copy_file (source_path, target_path, &target_path, callback, callback_data, &err);
+ }
+ else if (_thunar_vfs_path_is_local (source_path) && _thunar_vfs_path_is_local (target_path))
+ {
+ /* copying files in the file system */
+ succeed = _thunar_vfs_io_local_copy_file (source_path, target_path, &target_path, callback, callback_data, &err);
+ }
+ else
+ {
+ _thunar_vfs_assert_not_reached ();
+ return FALSE;
+ }
+
+ /* check if we succeed */
+ if (G_LIKELY (succeed))
+ {
+ /* schedule a "created" event for the target path */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, target_path);
+
+ /* return the new target path */
+ if (G_LIKELY (target_path_return != NULL))
+ *target_path_return = target_path;
+ else
+ thunar_vfs_path_unref (target_path);
+ }
+ else
+ {
+ /* generate a useful error message */
+ tvio_set_g_error_with_paths (error, _("Failed to copy \"%s\" to \"%s\""), source_path, target_path, err);
+ g_error_free (err);
+ }
+
+ return succeed;
+}
+
+
+
+/**
+ * _thunar_vfs_io_ops_link_file:
+ * @source_path : the #ThunarVfsPath to the source file.
+ * @target_path : the #ThunarVfsPath to the target location.
+ * @target_path_return : return location for the final target path or %NULL.
+ * @error : return location for errors or %NULL.
+ *
+ * Creates a symbolic link at @target_path, which points to @source_path. The
+ * real target path may be different than the suggested @target_path, and will
+ * be returned in @target_path_return if not %NULL.
+ *
+ * The caller is responsible to free the #ThunarVfsPath object returned in
+ * @target_path_return using thunar_vfs_path_unref() when no longer needed
+ * if %TRUE is returned.
+ *
+ * Return value: %TRUE if the link was successfully created, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_ops_link_file (ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ GError **error)
+{
+ gboolean succeed = FALSE;
+ GError *err = NULL;
+
+ _thunar_vfs_return_val_if_fail (!thunar_vfs_path_is_root (source_path), FALSE);
+ _thunar_vfs_return_val_if_fail (!thunar_vfs_path_is_root (target_path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* check if either source and target are local */
+ if (_thunar_vfs_path_is_local (source_path) && _thunar_vfs_path_is_local (target_path))
+ {
+ /* copying files in the file system */
+ succeed = _thunar_vfs_io_local_link_file (source_path, target_path, &target_path, &err);
+ }
+ else
+ {
+ /* impossible to perform the link operation */
+ g_set_error (&err, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Links from or to resources in the trash are not supported"));
+ }
+
+ /* check if we succeed */
+ if (G_LIKELY (succeed))
+ {
+ /* schedule a "created" event for the target path */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, target_path);
+
+ /* return the new target path */
+ if (G_LIKELY (target_path_return != NULL))
+ *target_path_return = target_path;
+ else
+ thunar_vfs_path_unref (target_path);
+ }
+ else
+ {
+ /* generate a useful error message */
+ tvio_set_g_error_with_paths (error, _("Failed to link \"%s\" to \"%s\""), source_path, target_path, err);
+ g_error_free (err);
+ }
+
+ return succeed;
+}
+
+
+
+/**
+ * _thunar_vfs_io_ops_move_file:
+ * @source_path : the #ThunarVfsPath to the source file.
+ * @target_path : the #ThunarVfsPath to the target location.
+ * @target_path_return : the final #ThunarVfsPath of the target location, which
+ * may be different than the @target_path.
+ * @error : return location for errors or %NULL.
+ *
+ * Moves the file at the @source_path to the location specified by the
+ * @target_path. The final target location is returned in @target_path_return.
+ *
+ * Return value: %TRUE if the file was successfully moved, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_ops_move_file (ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ GError **error)
+{
+ gboolean succeed;
+ GError *err = NULL;
+
+ _thunar_vfs_return_val_if_fail (!thunar_vfs_path_is_root (source_path), FALSE);
+ _thunar_vfs_return_val_if_fail (!thunar_vfs_path_is_root (target_path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* check if either source or target is trash */
+ if (_thunar_vfs_path_is_trash (source_path) || _thunar_vfs_path_is_trash (target_path))
+ {
+ /* move to or from the trash may result in a new target path */
+ succeed = _thunar_vfs_io_trash_move_file (source_path, target_path, &target_path, &err);
+ }
+ else if (_thunar_vfs_path_is_local (source_path) && _thunar_vfs_path_is_local (target_path))
+ {
+ /* moving files in the file system */
+ succeed = _thunar_vfs_io_local_move_file (source_path, target_path, &err);
+
+ /* local move does not alter the target path */
+ if (G_LIKELY (succeed))
+ thunar_vfs_path_ref (target_path);
+ }
+ else
+ {
+ _thunar_vfs_assert_not_reached ();
+ return FALSE;
+ }
+
+ /* check if we succeed */
+ if (G_LIKELY (succeed))
+ {
+ /* drop the thumbnails for the source path */
+ _thunar_vfs_thumbnail_remove_for_path (source_path);
+
+ /* schedule a "created" event for the target path */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, target_path);
+
+ /* schedule a "deleted" event for the source path */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_DELETED, source_path);
+
+ /* return the new target path */
+ if (G_LIKELY (target_path_return != NULL))
+ *target_path_return = target_path;
+ else
+ thunar_vfs_path_unref (target_path);
+ }
+ else
+ {
+ /* generate a useful error message */
+ tvio_set_g_error_with_paths (error, _("Failed to move \"%s\" to \"%s\""), source_path, target_path, err);
+ g_error_free (err);
+ }
+
+ return succeed;
+}
+
+
+
+/**
+ * _thunar_vfs_io_ops_mkdir:
+ * @path : the #ThunarVfsPath to the directory to create.
+ * @mode : the new #ThunarVfsFileMode for the directory.
+ * @flags : see #ThunarVfsIOOpsFlags.
+ * @error : return location for errors or %NULL.
+ *
+ * Creates a new directory at the specified @path with the given @mode.
+ *
+ * Return value: %TRUE if the directory was created successfully or the
+ * directory exists and %THUNAR_VFS_IO_OPS_IGNORE_EEXIST
+ * was specified in @flags, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_ops_mkdir (ThunarVfsPath *path,
+ ThunarVfsFileMode mode,
+ ThunarVfsIOOpsFlags flags,
+ GError **error)
+{
+ gboolean succeed;
+ gchar *absolute_path;
+ gchar *display_name;
+ gint sverrno;
+
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* translate the path object to an absolute path */
+ absolute_path = _thunar_vfs_path_translate_dup_string (path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_UNLIKELY (absolute_path == NULL))
+ return FALSE;
+
+ /* try to create the directory with the given mode */
+ succeed = (g_mkdir (absolute_path, mode) == 0 || (errno == EEXIST && (flags & THUNAR_VFS_IO_OPS_IGNORE_EEXIST) != 0));
+ if (G_UNLIKELY (!succeed))
+ {
+ /* save the errno value, may be modified */
+ sverrno = errno;
+
+ /* generate a useful error message */
+ display_name = g_filename_display_name (absolute_path);
+ _thunar_vfs_set_g_error_from_errno2 (error, sverrno, _("Failed to create directory \"%s\""), display_name);
+ g_free (display_name);
+ }
+ else if (G_LIKELY (errno != EEXIST))
+ {
+ /* schedule a "created" event for the directory path */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, path);
+ }
+
+ /* cleanup */
+ g_free (absolute_path);
+
+ return succeed;
+}
+
+
+
+/**
+ * _thunar_vfs_io_ops_remove:
+ * @path : the #ThunarVfsPath to the file to remove.
+ * @flags : see #ThunarVfsIOOpsFlags.
+ * @error : return location for errors or %NULL.
+ *
+ * Removes the file or folder at the specified @path.
+ *
+ * Return value: %TRUE if the file was successfully
+ * removed, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_ops_remove (ThunarVfsPath *path,
+ ThunarVfsIOOpsFlags flags,
+ GError **error)
+{
+ gboolean succeed;
+ GError *err = NULL;
+ gchar *message;
+ gchar *display_name;
+ gchar *absolute_path;
+
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* remove using the appropriate backend */
+ switch (thunar_vfs_path_get_scheme (path))
+ {
+ case THUNAR_VFS_PATH_SCHEME_FILE:
+ absolute_path = thunar_vfs_path_dup_string (path);
+ succeed = (g_remove (absolute_path) == 0);
+ if (G_UNLIKELY (!succeed))
+ _thunar_vfs_set_g_error_from_errno (&err, errno);
+ g_free (absolute_path);
+ break;
+
+ case THUNAR_VFS_PATH_SCHEME_TRASH:
+ succeed = _thunar_vfs_io_trash_remove (path, &err);
+ break;
+
+ default:
+ _thunar_vfs_assert_not_reached ();
+ return FALSE;
+ }
+
+ /* drop the thumbnails if the removal succeed */
+ if (G_LIKELY (succeed))
+ {
+ /* drop the thumbnails for the removed file */
+ _thunar_vfs_thumbnail_remove_for_path (path);
+
+ /* tell the monitor about the removed file */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_DELETED, path);
+ }
+ else if ((flags & THUNAR_VFS_IO_OPS_IGNORE_ENOENT) != 0 && err->domain == G_FILE_ERROR && err->code == G_FILE_ERROR_NOENT)
+ {
+ /* we should ignore ENOENT errors */
+ g_error_free (err);
+ succeed = TRUE;
+ }
+ else
+ {
+ /* generate a useful error message */
+ display_name = _thunar_vfs_path_dup_display_name (path);
+ message = g_strdup_printf (_("Failed to remove \"%s\""), display_name);
+ g_set_error (error, err->domain, err->code, "%s: %s", message, err->message);
+ g_free (display_name);
+ g_error_free (err);
+ g_free (message);
+ }
+
+ return succeed;
+}
+
+
+
+#define __THUNAR_VFS_IO_OPS_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-io-ops.h b/thunar-vfs/thunar-vfs-io-ops.h
new file mode 100644
index 0000000000000000000000000000000000000000..2dfa18d8224859820a30fd9fea653b52db3babff
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-ops.h
@@ -0,0 +1,92 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_IO_OPS_H__
+#define __THUNAR_VFS_IO_OPS_H__
+
+#include <thunar-vfs/thunar-vfs-path-private.h>
+#include <thunar-vfs/thunar-vfs-types.h>
+
+G_BEGIN_DECLS;
+
+/**
+ * ThunarVfsIOOpsFlags:
+ * @THUNAR_VFS_IO_OPS_NONE : no special behaviour.
+ * @THUNAR_VFS_IO_OPS_IGNORE_EEXIST : ignore EEXIST errors (for _thunar_vfs_io_ops_mkdir()).
+ * @THUNAR_VFS_IO_OPS_IGNORE_ENOENT : ignore ENOENT errors (for _thunar_vfs_io_ops_remove()).
+ *
+ * Flags for I/O operations.
+ **/
+typedef enum /*< flags, skip >*/
+{
+ THUNAR_VFS_IO_OPS_NONE = 0L,
+ THUNAR_VFS_IO_OPS_IGNORE_EEXIST = (1L << 0),
+ THUNAR_VFS_IO_OPS_IGNORE_ENOENT = (1L << 1),
+} ThunarVfsIOOpsFlags;
+
+/**
+ * ThunarVfsIOOpsProgressCallback:
+ * @chunk_size : the size of the next completed chunk of copied data.
+ * @callback_data : callback data specified for _thunar_vfs_io_ops_copy_file().
+ *
+ * Invoked during _thunar_vfs_io_ops_copy_file() to notify the caller
+ * about the progress of the operation.
+ *
+ * Return value: %FALSE to cancel the operation, %TRUE to continue.
+ **/
+typedef gboolean (*ThunarVfsIOOpsProgressCallback) (ThunarVfsFileSize chunk_size,
+ gpointer callback_data);
+
+gboolean _thunar_vfs_io_ops_get_file_size_and_type (ThunarVfsPath *path,
+ ThunarVfsFileSize *size_return,
+ ThunarVfsFileType *type_return,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+gboolean _thunar_vfs_io_ops_copy_file (ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ ThunarVfsIOOpsProgressCallback callback,
+ gpointer callback_data,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_ops_link_file (ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_ops_move_file (ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+gboolean _thunar_vfs_io_ops_mkdir (ThunarVfsPath *path,
+ ThunarVfsFileMode mode,
+ ThunarVfsIOOpsFlags flags,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+gboolean _thunar_vfs_io_ops_remove (ThunarVfsPath *path,
+ ThunarVfsIOOpsFlags flags,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_IO_OPS_H__ */
diff --git a/thunar-vfs/thunar-vfs-io-scandir.c b/thunar-vfs/thunar-vfs-io-scandir.c
new file mode 100644
index 0000000000000000000000000000000000000000..a943c296caa30d1dbee4470ba0a0623f6461d811
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-scandir.c
@@ -0,0 +1,173 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-io-scandir.h>
+#include <thunar-vfs/thunar-vfs-io-trash.h>
+#include <thunar-vfs/thunar-vfs-os.h>
+#include <thunar-vfs/thunar-vfs-private.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+
+
+static GList *tvis_collect (ThunarVfsPath *path,
+ volatile gboolean *cancelled,
+ gboolean recursive,
+ gboolean follow_links,
+ gchar *buffer,
+ GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+
+
+static GList*
+tvis_collect (ThunarVfsPath *path,
+ volatile gboolean *cancelled,
+ gboolean recursive,
+ gboolean follow_links,
+ gchar *buffer,
+ GError **error)
+{
+ GError *err = NULL;
+ GList *directories = NULL;
+ GList *child_path_list;
+ GList *path_list;
+ GList *lp;
+
+ /* scan the directory, according to the path scheme */
+ switch (thunar_vfs_path_get_scheme (path))
+ {
+ case THUNAR_VFS_PATH_SCHEME_FILE:
+ if (thunar_vfs_path_to_string (path, buffer, THUNAR_VFS_PATH_MAXSTRLEN, error) >= 0)
+ path_list = _thunar_vfs_os_scandir (path, buffer, follow_links, recursive ? &directories : NULL, error);
+ else
+ path_list = NULL;
+ break;
+
+ case THUNAR_VFS_PATH_SCHEME_TRASH:
+ path_list = _thunar_vfs_io_trash_scandir (path, follow_links, recursive ? &directories : NULL, error);
+ break;
+
+ default:
+ _thunar_vfs_assert_not_reached ();
+ return NULL;
+ }
+
+ /* perform the recursion */
+ for (lp = directories; lp != NULL; lp = lp->next)
+ {
+ /* check if the user cancelled the scanning */
+ if (G_UNLIKELY (cancelled != NULL && *cancelled))
+ {
+ /* user cancellation is EINTR */
+ _thunar_vfs_set_g_error_from_errno (error, EINTR);
+error:
+ thunar_vfs_path_list_free (path_list);
+ path_list = NULL;
+ break;
+ }
+
+ child_path_list = tvis_collect (lp->data, cancelled, TRUE, follow_links, buffer, &err);
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* we can ignore certain errors here */
+ if (G_UNLIKELY (err->domain != G_FILE_ERROR || (err->code != G_FILE_ERROR_ACCES && err->code != G_FILE_ERROR_NOTDIR
+ && err->code != G_FILE_ERROR_NOENT && err->code != G_FILE_ERROR_PERM)))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ goto error;
+ }
+
+ /* ignored that error */
+ g_clear_error (&err);
+ }
+
+ /* append the paths to our list */
+ path_list = g_list_concat (child_path_list, path_list);
+ }
+
+ /* cleanup */
+ g_list_free (directories);
+
+ return path_list;
+}
+
+
+
+/**
+ * _thunar_vfs_io_scandir:
+ * @path : the #ThunarVfsPath of the directory to scan.
+ * @cancelled : pointer to a volatile boolean variable, which if
+ * %TRUE means to cancel the scan operation. May be
+ * %NULL in which case the scanner cannot be
+ * cancelled.
+ * @flags : scanner flags.
+ * @error : return location for errors or %NULL.
+ *
+ * The caller is responsible to free the returned list
+ * using thunar_vfs_path_list_free() when no longer
+ * needed.
+ *
+ * If @cancelled becomes true during the scan operation, %NULL
+ * will be returned and @error will be set to %G_FILE_ERROR_INTR.
+ *
+ * Return value:
+ **/
+GList*
+_thunar_vfs_io_scandir (ThunarVfsPath *path,
+ volatile gboolean *cancelled,
+ ThunarVfsIOScandirFlags flags,
+ GError **error)
+{
+ gchar buffer[THUNAR_VFS_PATH_MAXSTRLEN];
+
+ _thunar_vfs_return_val_if_fail (path != NULL, NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* try to collect the paths */
+ return tvis_collect (path, cancelled,
+ (flags & THUNAR_VFS_IO_SCANDIR_RECURSIVE),
+ (flags & THUNAR_VFS_IO_SCANDIR_FOLLOW_LINKS),
+ buffer, error);
+}
+
+
+
+#define __THUNAR_VFS_IO_SCANDIR_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-io-scandir.h b/thunar-vfs/thunar-vfs-io-scandir.h
new file mode 100644
index 0000000000000000000000000000000000000000..f5772a61a9781d37df45346de3acd24993ea1024
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-scandir.h
@@ -0,0 +1,53 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_IO_SCANDIR_H__
+#define __THUNAR_VFS_IO_SCANDIR_H__
+
+#include <thunar-vfs/thunar-vfs-path.h>
+#include <thunar-vfs/thunar-vfs-types.h>
+
+G_BEGIN_DECLS;
+
+/**
+ * ThunarVfsIOScandirFlags:
+ * @THUNAR_VFS_IO_SCANDIR_RECURSIVE : scan directories recursively.
+ * @THUNAR_VFS_IO_SCANDIR_FOLLOW_LINKS : follow symbolic links to directories.
+ *
+ * Flags for _thnar_vfs_io_scandir().
+ **/
+typedef enum /*< flags, skip >*/
+{
+ THUNAR_VFS_IO_SCANDIR_RECURSIVE = (1L << 0),
+ THUNAR_VFS_IO_SCANDIR_FOLLOW_LINKS = (1L << 1),
+} ThunarVfsIOScandirFlags;
+
+GList *_thunar_vfs_io_scandir (ThunarVfsPath *path,
+ volatile gboolean *cancelled,
+ ThunarVfsIOScandirFlags flags,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_IO_SCANDIR_H__ */
diff --git a/thunar-vfs/thunar-vfs-io-trash.c b/thunar-vfs/thunar-vfs-io-trash.c
new file mode 100644
index 0000000000000000000000000000000000000000..aca01f2c32254a0319a8779f89e2c87be37889a7
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-trash.c
@@ -0,0 +1,1388 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-io-local.h>
+#include <thunar-vfs/thunar-vfs-io-trash.h>
+#include <thunar-vfs/thunar-vfs-mime-database-private.h>
+#include <thunar-vfs/thunar-vfs-monitor-private.h>
+#include <thunar-vfs/thunar-vfs-os.h>
+#include <thunar-vfs/thunar-vfs-private.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+/* Use g_open(), g_remove(), g_lstat(), and g_unlink() on win32 */
+#if defined(G_OS_WIN32)
+#include <glib/gstdio.h>
+#else
+#define g_open(path, flags, mode) (open ((path), (flags), (mode)))
+#define g_remove(path) (remove ((path)))
+#define g_lstat(path, statb) (lstat ((path), (statb)))
+#define g_unlink(path) (unlink ((path)))
+#endif
+
+
+
+static inline gchar *tvit_resolve_original_path (guint trash_id,
+ const gchar *original_path_escaped,
+ const gchar *relative_path,
+ GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+
+
+/* representation of a trash directory */
+typedef struct
+{
+ gchar *top_dir; /* toplevel directory for the trash (mount point or home dir) */
+ gchar *trash_dir; /* absolute path to the trash directory with "files" and "info" */
+ time_t mtime; /* the last modification time of the "files" folder */
+ guint empty : 1; /* %TRUE if the trash is empty */
+} ThunarVfsIOTrash;
+
+/* list of all known ThunarVfsIOTrashes */
+static ThunarVfsIOTrash *_thunar_vfs_io_trashes;
+static guint _thunar_vfs_io_n_trashes;
+
+/* TRUE if trashes were scanned already */
+static gint _thunar_vfs_io_trash_timer_id = -1;
+
+/* the trash subsystem lock */
+G_LOCK_DEFINE_STATIC (_thunar_vfs_io_trash);
+
+
+
+/**
+ * _thunar_vfs_io_trash_scan:
+ *
+ * Initially scans the trash directories if _thunar_vfs_io_trash_rescan()
+ * was not called so far.
+ **/
+void
+_thunar_vfs_io_trash_scan (void)
+{
+ /* scan the trash if not already done */
+ if (G_UNLIKELY (_thunar_vfs_io_trash_timer_id < 0))
+ _thunar_vfs_io_trash_rescan ();
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_rescan:
+ *
+ * Rescans all trash directories and emits a changed event for
+ * the trash root folder if any of the trash directories changed.
+ *
+ * Return value: always %TRUE due to implementation details.
+ **/
+gboolean
+_thunar_vfs_io_trash_rescan (void)
+{
+ struct stat statb;
+ time_t mtime;
+ gchar *files_dir;
+ guint n;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_io_trashes != NULL, FALSE);
+
+ /* acquire the trash subsystem lock */
+ G_LOCK (_thunar_vfs_io_trash);
+
+ /* check if we already scheduled the trash scan timer */
+ if (G_UNLIKELY (_thunar_vfs_io_trash_timer_id < 0))
+ {
+ /* schedule a timer to regularly scan the trash directories */
+ _thunar_vfs_io_trash_timer_id = g_timeout_add (5 * 1000, (GSourceFunc) _thunar_vfs_io_trash_rescan, NULL);
+ }
+
+ /* scan all known trash directories */
+ for (n = 0; n < _thunar_vfs_io_n_trashes; ++n)
+ {
+ /* determine the absolute path to the "files" directory */
+ files_dir = g_build_filename (_thunar_vfs_io_trashes[n].trash_dir, "files", NULL);
+
+ /* check if the "files" directory was changed */
+ mtime = (g_lstat (files_dir, &statb) == 0) ? statb.st_mtime : 0;
+ if (_thunar_vfs_io_trashes[n].mtime != mtime)
+ {
+ /* remember the new mtime */
+ _thunar_vfs_io_trashes[n].mtime = mtime;
+
+ /* check if the directory is empty now */
+ _thunar_vfs_io_trashes[n].empty = _thunar_vfs_os_is_dir_empty (files_dir);
+
+ /* schedule a "changed" event for the trash root folder */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CHANGED, _thunar_vfs_path_trash_root);
+ }
+
+ /* cleanup */
+ g_free (files_dir);
+ }
+
+ /* release the trash subsystem lock */
+ G_UNLOCK (_thunar_vfs_io_trash);
+
+ /* keep the timer alive */
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_get_top_dir:
+ * @trash_id : the id of the trash, whose absolute toplevel directory to return.
+ * @error : return location for errors or %NULL.
+ *
+ * Returns the absolute path to the toplevel directory for the
+ * trash with the specified @trash_id, or %NULL if the @trash_id
+ * is invalid.
+ *
+ * The caller is responsible to free the returned string using
+ * g_free() when no longer needed.
+ *
+ * Return value: the absolute path to the toplevel directory for
+ * the trash with the specified @trash_id, or %NULL
+ * in case of an error.
+ **/
+gchar*
+_thunar_vfs_io_trash_get_top_dir (guint trash_id,
+ GError **error)
+{
+ gchar *top_dir;
+
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* acquire the trash subsystem lock */
+ G_LOCK (_thunar_vfs_io_trash);
+
+ /* check if the trash-id is valid */
+ if (G_LIKELY (trash_id < _thunar_vfs_io_n_trashes))
+ {
+ /* just return the absolute path to the trash's top dir */
+ top_dir = g_strdup (_thunar_vfs_io_trashes[trash_id].top_dir);
+ }
+ else
+ {
+ /* the trash-id is invalid */
+ _thunar_vfs_set_g_error_from_errno (error, ENOENT);
+ top_dir = NULL;
+ }
+
+ /* release the trash subsystem lock */
+ G_UNLOCK (_thunar_vfs_io_trash);
+
+ return top_dir;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_get_trash_dir:
+ * @trash_id : the id of the trash, whose absolute path to return.
+ * @error : return location for errors or %NULL.
+ *
+ * Returns the absolute path to the trash directory for the trash
+ * with the specified @trash_id, or %NULL if the @trash_id is
+ * invalid.
+ *
+ * The caller is responsible to free the returned string using
+ * g_free() when no longer needed.
+ *
+ * Return value: the absolute path to the trash directory with
+ * the specified @trash_id, or %NULL on error.
+ **/
+gchar*
+_thunar_vfs_io_trash_get_trash_dir (guint trash_id,
+ GError **error)
+{
+ gchar *trash_dir;
+
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* acquire the trash subsystem lock */
+ G_LOCK (_thunar_vfs_io_trash);
+
+ /* check if the trash-id is valid */
+ if (G_LIKELY (trash_id < _thunar_vfs_io_n_trashes))
+ {
+ /* just return the absolute path to the trash */
+ trash_dir = g_strdup (_thunar_vfs_io_trashes[trash_id].trash_dir);
+ }
+ else
+ {
+ /* the trash-id is invalid */
+ _thunar_vfs_set_g_error_from_errno (error, ENOENT);
+ trash_dir = NULL;
+ }
+
+ /* release the trash subsystem lock */
+ G_UNLOCK (_thunar_vfs_io_trash);
+
+ return trash_dir;
+}
+
+
+
+static inline gchar*
+tvit_resolve_original_path (guint trash_id,
+ const gchar *original_path_escaped,
+ const gchar *relative_path,
+ GError **error)
+{
+ gchar *original_path_unescaped;
+ gchar *absolute_path = NULL;
+ gchar *top_dir;
+
+ /* unescape the path according to RFC 2396 */
+ original_path_unescaped = _thunar_vfs_unescape_rfc2396_string (original_path_escaped, -1, "/", FALSE, error);
+ if (G_UNLIKELY (original_path_unescaped == NULL))
+ return NULL;
+
+ /* check if we have a relative path here */
+ if (!g_path_is_absolute (original_path_unescaped))
+ {
+ /* determine the toplevel directory for the trash-id */
+ top_dir = _thunar_vfs_io_trash_get_top_dir (trash_id, error);
+ if (G_LIKELY (top_dir != NULL))
+ absolute_path = g_build_filename (top_dir, original_path_unescaped, relative_path, NULL);
+ g_free (original_path_unescaped);
+ g_free (top_dir);
+ }
+ else
+ {
+ /* generate the absolute with the relative part */
+ absolute_path = g_build_filename (original_path_unescaped, relative_path, NULL);
+ g_free (original_path_unescaped);
+ }
+
+ return absolute_path;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_get_trash_info:
+ * @path : a valid trash:-URI, which is not the trash root path.
+ * @original_path_return : return location for the original path or %NULL.
+ * @deletion_date_return : return location for the deletion date or %NULL.
+ * @error : return location for errors or %NULL.
+ *
+ * Reads the <filename>.trashinfo</filename> file for the @path and sets
+ * @original_path_return and @deletion_date_return appropriately.
+ *
+ * Return value: %TRUE if the info was determined successfully, %FALSE on error.
+ **/
+gboolean
+_thunar_vfs_io_trash_get_trash_info (const ThunarVfsPath *path,
+ gchar **original_path_return,
+ gchar **deletion_date_return,
+ GError **error)
+{
+ GKeyFile *key_file;
+ GError *err = NULL;
+ gchar *original_path;
+ gchar *relative_path;
+ gchar *info_file;
+ gchar *trash_dir;
+ gchar *file_id = NULL;
+ guint trash_id;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* try to parse the trash path */
+ if (!_thunar_vfs_io_trash_path_parse (path, &trash_id, &file_id, &relative_path, error))
+ return FALSE;
+
+ /* determine the .trashinfo file for the path */
+ trash_dir = _thunar_vfs_io_trash_get_trash_dir (trash_id, &err);
+ info_file = (trash_dir != NULL) ? g_strconcat (trash_dir, G_DIR_SEPARATOR_S "info" G_DIR_SEPARATOR_S, file_id, ".trashinfo", NULL) : NULL;
+ g_free (trash_dir);
+
+ /* check if we have a path */
+ if (G_LIKELY (info_file != NULL))
+ {
+ /* parse the .trashinfo file */
+ key_file = g_key_file_new ();
+ if (g_key_file_load_from_file (key_file, info_file, 0, &err))
+ {
+ /* query the original path if requested */
+ if (G_LIKELY (original_path_return != NULL))
+ {
+ /* read the original path from the .trashinfo file */
+ original_path = g_key_file_get_string (key_file, "Trash Info", "Path", &err);
+ if (G_LIKELY (original_path != NULL))
+ {
+ /* determine the absolute path for the original path */
+ *original_path_return = tvit_resolve_original_path (trash_id, original_path, relative_path, &err);
+ g_free (original_path);
+ }
+ }
+
+ /* query the deletion date if requested */
+ if (err == NULL && deletion_date_return != NULL)
+ *deletion_date_return = g_key_file_get_string (key_file, "Trash Info", "DeletionDate", &err);
+ }
+ g_key_file_free (key_file);
+ }
+
+ /* propagate a possible error */
+ if (G_UNLIKELY (err != NULL))
+ g_propagate_error (error, err);
+
+ /* cleanup */
+ g_free (relative_path);
+ g_free (info_file);
+ g_free (file_id);
+
+ return (err == NULL);
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_new_trash_info:
+ * @original_path : the original, local path of the file to delete.
+ * @trash_id_return : return location for the trash id.
+ * @file_id_return : return location for the file id.
+ * @error : return location for errors or %NULL.
+ *
+ * Generates a new <filename>.trashinfo</filename> file for the file
+ * at the @original_path and returns the trash-id of the target trash
+ * in @trash_id_return and the file-id of the target trash file in
+ * @file_id_return. The caller is responsible to free the string
+ * returned in @file_id_return using g_free() when no longer needed.
+ *
+ * Return value: %TRUE if the <filename>.trashinfo</filename> was
+ * successfully generated, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_trash_new_trash_info (const ThunarVfsPath *original_path,
+ guint *trash_id_return,
+ gchar **file_id_return,
+ GError **error)
+{
+ const gchar *original_name = thunar_vfs_path_get_name (original_path);
+ struct stat statb;
+ gchar deletion_date[128];
+ gchar info_file[THUNAR_VFS_PATH_MAXSTRLEN];
+ gchar *original_uri;
+ gchar *info_dir;
+ gchar *content;
+ gint fd;
+ gint n;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_local (original_path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (trash_id_return != NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (file_id_return != NULL, FALSE);
+
+ /* we are currently limited to the home trash */
+ G_LOCK (_thunar_vfs_io_trash);
+ info_dir = g_build_filename (_thunar_vfs_io_trashes[0].trash_dir, "info", NULL);
+ G_UNLOCK (_thunar_vfs_io_trash);
+
+ /* generate a unique file-id */
+ g_snprintf (info_file, sizeof (info_file), "%s" G_DIR_SEPARATOR_S "%s.trashinfo", info_dir, original_name);
+ for (n = 1;; ++n)
+ {
+ /* exclusively create the .trashinfo file */
+ fd = g_open (info_file, O_CREAT | O_EXCL | O_WRONLY, 0600);
+ if (G_LIKELY (fd >= 0))
+ break;
+
+ /* check if we need to create the info directory */
+ if (G_UNLIKELY (errno == ENOENT))
+ {
+ /* try to create the info directory */
+ if (!xfce_mkdirhier (info_dir, 0700, error))
+ goto err1;
+
+ /* try again with same .trashinfo name */
+ continue;
+ }
+
+ /* check if the error cannot be recovered */
+ if (G_UNLIKELY (errno != EEXIST))
+ {
+err0: /* spit out a useful error message */
+ content = g_filename_display_name (info_file);
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_IO, _("Failed to open \"%s\" for writing"), content);
+ g_free (content);
+err1:
+ g_free (info_dir);
+ return FALSE;
+ }
+
+ /* generate a new unique .trashinfo file name and try again */
+ g_snprintf (info_file, sizeof (info_file), "%s" G_DIR_SEPARATOR_S "%s$%d.trashinfo", info_dir, original_name, n);
+ }
+
+ /* stat the file to get the deletion date from the filesystem (NFS, ...) */
+ if (fstat (fd, &statb) < 0)
+ {
+err2: /* should not happen */
+ g_unlink (info_file);
+ close (fd);
+ goto err0;
+ }
+
+ /* generate the .trashinfo content */
+ original_uri = thunar_vfs_path_dup_uri (original_path);
+ strftime (deletion_date, sizeof (deletion_date), "%FT%T", localtime (&statb.st_mtime));
+ content = g_strdup_printf ("[Trash Info]\nPath=%s\nDeletionDate=%s\n",
+ original_uri + (sizeof ("file://") - 1),
+ deletion_date);
+ g_free (original_uri);
+
+ /* try to save the content (all at once) */
+ if (write (fd, content, strlen (content)) != strlen (content))
+ {
+ /* no space left, etc. */
+ g_free (content);
+ goto err2;
+ }
+
+ /* strip off the .trashinfo from the info_file */
+ info_file[strlen (info_file) - (sizeof (".trashinfo") - 1)] = '\0';
+
+ /* return the file-id and trash-id */
+ *file_id_return = g_path_get_basename (info_file);
+ *trash_id_return = 0;
+
+ /* cleanup */
+ g_free (content);
+ g_free (info_dir);
+ close (fd);
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_path_new
+ * @trash_id : the id of the trash can.
+ * @file_id : the id of the file in the trash.
+ * @relative_path : the relative path or the empty string.
+ *
+ * The caller is responsible to free the returned #ThunarVfsPath using
+ * thunar_vfs_path_unref() when no longer needed.
+ *
+ * Returns a new #ThunarVfsPath that represents the trash resource in
+ * the trash directory with the specified @trash_id, whose basename is
+ * @file_id, at the given @relative_path.
+ *
+ * Return value: the #ThunarVfsPath for the specified trash resource.
+ **/
+ThunarVfsPath*
+_thunar_vfs_io_trash_path_new (guint trash_id,
+ const gchar *file_id,
+ const gchar *relative_path)
+{
+ ThunarVfsPath *parent;
+ ThunarVfsPath *path;
+ gchar *name;
+
+ _thunar_vfs_return_val_if_fail (strchr (file_id, '/') == NULL, NULL);
+ _thunar_vfs_return_val_if_fail (relative_path != NULL, NULL);
+
+ /* generate the path to the trash subfolder */
+ name = g_strdup_printf ("%u-%s", trash_id, file_id);
+ parent = _thunar_vfs_path_new_relative (_thunar_vfs_path_trash_root, name);
+ g_free (name);
+
+ /* generate the relative path */
+ path = _thunar_vfs_path_new_relative (parent, relative_path);
+ _thunar_vfs_path_unref_nofree (parent);
+
+ return path;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_path_parse:
+ * @path : a valid trash:-URI path, but not the "trash:///" root path.
+ * @trash_id_return : return location for the trash-id or %NULL.
+ * @file_id_return : return location for the file-id or %NULL.
+ * @relative_path_return : return location for the relative part or %NULL.
+ * @error : return location for errors or %NULL.
+ *
+ * The relative component of @path may be %NULL if the @path refers to a toplevel
+ * trash directory, i.e. "trash:///1-file". In this case %TRUE is returned, and
+ * @relative_path_return will be set to %NULL.
+ *
+ * The caller is responsible to free the strings placed in @file_id_return and
+ * @relative_path_return using g_free() when no longer needed.
+ *
+ * Return value: %TRUE if the @path was parsed successfully, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_trash_path_parse (const ThunarVfsPath *path,
+ guint *trash_id_return,
+ gchar **file_id_return,
+ gchar **relative_path_return,
+ GError **error)
+{
+ typedef struct _TrashPathItem
+ {
+ const ThunarVfsPath *path;
+ struct _TrashPathItem *next;
+ } TrashPathItem;
+
+ const ThunarVfsPath *parent;
+ TrashPathItem *item;
+ TrashPathItem *root = NULL;
+ const gchar *name;
+ const gchar *s;
+ gchar *t;
+ gchar *uri;
+ guint trash_id;
+ guint n;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* cannot parse the trash root path */
+ if (G_UNLIKELY (path->parent == NULL))
+ {
+invalid_uri:
+ uri = thunar_vfs_path_dup_uri (path);
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("The URI \"%s\" does not refer to a valid resource in the trash"), uri);
+ g_free (uri);
+ return FALSE;
+ }
+
+ /* determine the paths up to, but not including, the root path */
+ for (parent = path; parent->parent != NULL; parent = parent->parent)
+ {
+ item = g_newa (TrashPathItem, 1);
+ item->path = parent;
+ item->next = root;
+ root = item;
+ }
+
+ /* try to parse the first path component (<trashId>-<fileId>) */
+ name = thunar_vfs_path_get_name (root->path);
+ trash_id = strtoul (name, (gpointer) &s, 10);
+ if (G_UNLIKELY (s == name || s[0] != '-' || s[1] == '\0'))
+ goto invalid_uri;
+
+ /* return the trash/file id */
+ if (G_LIKELY (trash_id_return != NULL))
+ *trash_id_return = trash_id;
+ if (G_LIKELY (file_id_return != NULL))
+ *file_id_return = g_strdup (s + 1);
+
+ /* return the relative path if requested */
+ if (G_LIKELY (relative_path_return != NULL))
+ {
+ /* check if we have a relative component */
+ if (G_LIKELY (path != root->path))
+ {
+ /* we don't care for the root item anymore */
+ root = root->next;
+
+ /* allocate memory to store the relative part */
+ for (item = root, n = 0; item != NULL; item = item->next)
+ n += 1 + strlen (thunar_vfs_path_get_name (item->path));
+ *relative_path_return = g_malloc (n);
+
+ /* actually store the relative part */
+ for (item = root, t = *relative_path_return; item != NULL; item = item->next)
+ {
+ if (item != root)
+ *t++ = G_DIR_SEPARATOR;
+ for (s = thunar_vfs_path_get_name (item->path); *s != '\0'; )
+ *t++ = *s++;
+ }
+ *t = '\0';
+ }
+ else
+ {
+ /* no relative component */
+ *relative_path_return = NULL;
+ }
+ }
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_path_resolve:
+ * @path : a valid trash:-URI, but not the trash root path.
+ * @error : return location for errors or %NULL.
+ *
+ * Resolves the trash @path to the absolute local path to the
+ * specified resource. Returns %NULL if the @path is invalid.
+ *
+ * The caller is responsible to free the returned string using
+ * g_free() when no longer needed.
+ *
+ * Return value: the absolute, local path to the trash resource
+ * at the given @path, or %NULL on error.
+ **/
+gchar*
+_thunar_vfs_io_trash_path_resolve (const ThunarVfsPath *path,
+ GError **error)
+{
+ gchar *absolute_path = NULL;
+ gchar *relative_path;
+ gchar *trash_dir;
+ gchar *file_id;
+ guint trash_id;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (path), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* try to parse the trash path */
+ if (_thunar_vfs_io_trash_path_parse (path, &trash_id, &file_id, &relative_path, error))
+ {
+ /* lookup the trash directory for the trash-id */
+ trash_dir = _thunar_vfs_io_trash_get_trash_dir (trash_id, error);
+ if (G_LIKELY (trash_dir != NULL))
+ {
+ /* generate the absolute path to the file in the trash */
+ absolute_path = g_build_filename (trash_dir, "files", file_id, relative_path, NULL);
+ g_free (trash_dir);
+ }
+
+ /* cleanup */
+ g_free (relative_path);
+ g_free (file_id);
+ }
+
+ return absolute_path;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_get_info:
+ * @path : a valid trash:-URI for which to determine the file info.
+ * @error : return location for errors or %NULL.
+ *
+ * Determines the #ThunarVfsInfo for the trashed file at the specified
+ * @path.
+ *
+ * The caller is responsible to free the returned #ThunarVfsInfo
+ * using thunar_vfs_info_unref() when no longer needed.
+ *
+ * Return value: the #ThunarVfsInfo for the specified @path, or %NULL
+ * in case of an error.
+ **/
+ThunarVfsInfo*
+_thunar_vfs_io_trash_get_info (ThunarVfsPath *path,
+ GError **error)
+{
+ ThunarVfsFileTime mtime;
+ ThunarVfsInfo *info;
+ gboolean empty;
+ gchar *absolute_path;
+ gchar *original_path;
+ guint n;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (path), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* check if path is the trash root directory */
+ if (thunar_vfs_path_is_root (path))
+ {
+ /* innitially scan the trash directories */
+ _thunar_vfs_io_trash_scan ();
+
+ /* acquire the trash subsystem lock */
+ G_LOCK (_thunar_vfs_io_trash);
+
+ /* determine the mtime of the trash and check if its empty */
+ for (empty = TRUE, mtime = 0, n = 0; n < _thunar_vfs_io_n_trashes; ++n)
+ {
+ /* atleast one trash dir not empty -> trash not empty */
+ if (G_LIKELY (!_thunar_vfs_io_trashes[n].empty))
+ empty = FALSE;
+
+ /* most recent mtime -> mtime for the trash */
+ if (G_LIKELY (_thunar_vfs_io_trashes[n].mtime > mtime))
+ mtime = _thunar_vfs_io_trashes[n].mtime;
+ }
+
+ /* release the trash subsystem lock */
+ G_UNLOCK (_thunar_vfs_io_trash);
+
+ /* allocate info for the trash root folder */
+ info = _thunar_vfs_slice_new0 (ThunarVfsInfo);
+ info->type = THUNAR_VFS_FILE_TYPE_DIRECTORY;
+ info->mode = THUNAR_VFS_FILE_MODE_USR_ALL;
+ info->flags = THUNAR_VFS_FILE_FLAGS_READABLE | THUNAR_VFS_FILE_FLAGS_WRITABLE;
+ info->uid = getuid ();
+ info->gid = getgid ();
+ info->size = empty ? 0 : 4096;
+ info->atime = mtime;
+ info->mtime = mtime;
+ info->ctime = mtime;
+ info->mime_info = thunar_vfs_mime_info_ref (_thunar_vfs_mime_inode_directory);
+ info->path = thunar_vfs_path_ref (_thunar_vfs_path_trash_root);
+ info->custom_icon = g_strdup (empty ? "gnome-fs-trash-empty" : "gnome-fs-trash-full");
+ info->display_name = g_strdup (_("Trash"));
+ info->ref_count = 1;
+ }
+ else
+ {
+ /* read the information from the disk using the absolute path */
+ absolute_path = _thunar_vfs_io_trash_path_resolve (path, error);
+ info = (absolute_path != NULL) ? _thunar_vfs_io_local_get_info (path, absolute_path, error) : NULL;
+ g_free (absolute_path);
+
+ /* check if we can adjust the name to the original one */
+ if (info != NULL && thunar_vfs_path_is_root (path->parent) && info->display_name == thunar_vfs_path_get_name (path))
+ {
+ /* try to determine the original path */
+ if (_thunar_vfs_io_trash_get_trash_info (path, &original_path, NULL, NULL))
+ {
+ /* use the original name as display name for the file */
+ info->display_name = g_path_get_basename (original_path);
+ g_free (original_path);
+ }
+ }
+ }
+
+ return info;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_get_metadata:
+ * @path : the #ThunarVfsPath of the file for which to return the @metadata.
+ * @metadata : the #ThunarVfsInfoMetadata you are interested in.
+ * @error : return location for errors or %NULL.
+ *
+ * Similar to _thunar_vfs_io_local_get_metadata(), but works on trashed resources.
+ *
+ * The caller is responsible to free the returned string using g_free() when no
+ * longer needed.
+ *
+ * Return value: the @metadata string or %NULL.
+ **/
+gchar*
+_thunar_vfs_io_trash_get_metadata (ThunarVfsPath *path,
+ ThunarVfsInfoMetadata metadata,
+ GError **error)
+{
+ ThunarVfsPath *local_path;
+ gchar *result = NULL;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (path), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ switch (metadata)
+ {
+ case THUNAR_VFS_INFO_METADATA_FILE_LINK_TARGET:
+ local_path = _thunar_vfs_path_translate (path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_LIKELY (local_path != NULL))
+ {
+ result = _thunar_vfs_io_local_get_metadata (local_path, metadata, error);
+ thunar_vfs_path_unref (local_path);
+ }
+ break;
+
+ case THUNAR_VFS_INFO_METADATA_TRASH_ORIGINAL_PATH:
+ if (!_thunar_vfs_io_trash_get_trash_info (path, &result, NULL, error))
+ result = NULL;
+ break;
+
+ case THUNAR_VFS_INFO_METADATA_TRASH_DELETION_DATE:
+ if (!_thunar_vfs_io_trash_get_trash_info (path, NULL, &result, error))
+ result = NULL;
+ break;
+
+ default:
+ _thunar_vfs_set_g_error_from_errno (error, EINVAL);
+ break;
+ }
+
+ return result;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_listdir:
+ * @path : a valid trash:-URI for the trash folder, whose contents to list.
+ * @error : return location for errors, or %NULL.
+ *
+ * Returns the files in the trash folder @path or %NULL if either no files
+ * are present in the folder at @path, or an error occurred, in which case
+ * the @error will be set to point to a #GError describing the cause.
+ *
+ * The caller is responsible to free the returned #GList of #ThunarVfsInfo<!---->s
+ * using thunar_vfs_info_list_free() when no longer needed.
+ *
+ * Return value: the #ThunarVfsInfo<!---->s for the files in the folder at @path.
+ **/
+GList*
+_thunar_vfs_io_trash_listdir (ThunarVfsPath *path,
+ GError **error)
+{
+ ThunarVfsInfo *info;
+ GList *list;
+ GList *sp;
+ GList *tp;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (path), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* scan the paths in the folder */
+ list = _thunar_vfs_io_trash_scandir (path, TRUE, NULL, error);
+ if (G_LIKELY (list != NULL))
+ {
+ /* associate file infos with the paths in the folder */
+ for (sp = tp = list; sp != NULL; sp = sp->next)
+ {
+ /* try to determine the file info */
+ info = _thunar_vfs_io_trash_get_info (sp->data, NULL);
+
+ /* replace the path with the info on the list */
+ if (G_LIKELY (info != NULL))
+ {
+ /* just decrease the ref_count on path (info holds a reference now) */
+ _thunar_vfs_path_unref_nofree (sp->data);
+
+ /* add the info to the list */
+ tp->data = info;
+ tp = tp->next;
+ }
+ else
+ {
+ /* no info, may need to free the path */
+ thunar_vfs_path_unref (sp->data);
+ }
+ }
+
+ /* release the not-filled list items (only non-NULL in case of an info error) */
+ if (G_UNLIKELY (tp != NULL))
+ {
+ if (G_LIKELY (tp->prev != NULL))
+ tp->prev->next = NULL;
+ else
+ list = NULL;
+ g_list_free (tp);
+ }
+ }
+
+ return list;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_copy_file:
+ * @source_path : the #ThunarVfsPath of the source file.
+ * @target_path : the #ThunarVfsPath of the target location.
+ * @target_path_return : return location for the final #ThunarVfsPath to which
+ * the file was copied.
+ * @callback : see #ThunarVfsIOOpsProgressCallback.
+ * @callback_data : additional user data for @callback.
+ * @error : return location for errors or %NULL.
+ *
+ * Copies a file from or to the trash. Cannot currently handle copying files
+ * within the trash.
+ *
+ * See the description of _thunar_vfs_io_ops_copy_file() for further details.
+ *
+ * Return value: %TRUE if succeed, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_trash_copy_file (ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ ThunarVfsIOOpsProgressCallback callback,
+ gpointer callback_data,
+ GError **error)
+{
+ ThunarVfsPath *source_local_path;
+ ThunarVfsPath *target_local_path;
+ gboolean succeed = FALSE;
+ gchar *file_id;
+ guint trash_id;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (source_path) || _thunar_vfs_path_is_trash (target_path), FALSE);
+ _thunar_vfs_return_val_if_fail (!thunar_vfs_path_is_root (source_path), FALSE);
+ _thunar_vfs_return_val_if_fail (!thunar_vfs_path_is_root (target_path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (target_path_return != NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (callback != NULL, FALSE);
+
+ /* check if we're moving to or from the trash */
+ if (_thunar_vfs_path_is_trash (source_path) && _thunar_vfs_path_is_trash (target_path))
+ {
+ /* we don't support copying files within the trash */
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_IO, _("Cannot move or copy files within the trash"));
+ }
+ else if (_thunar_vfs_path_is_trash (source_path)) /* copying out of the trash */
+ {
+ /* translate the source path to a local path */
+ source_local_path = _thunar_vfs_path_translate (source_path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_LIKELY (source_local_path != NULL))
+ {
+ /* try to copy the file out of the trash using the generic copy logic for local files */
+ succeed = _thunar_vfs_io_ops_copy_file (source_local_path, target_path, NULL, callback, callback_data, error);
+ thunar_vfs_path_unref (source_local_path);
+
+ /* target path is the same for local paths */
+ if (G_LIKELY (succeed))
+ *target_path_return = thunar_vfs_path_ref (target_path);
+ }
+ }
+ else if (!thunar_vfs_path_is_root (target_path->parent)) /* copying into a trash subfolder */
+ {
+ /* translate the target path to a local path */
+ target_local_path = _thunar_vfs_path_translate (target_path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_LIKELY (target_local_path != NULL))
+ {
+ /* try to copy the file into the trash */
+ succeed = _thunar_vfs_io_ops_copy_file (source_path, target_local_path, NULL, callback, callback_data, error);
+ thunar_vfs_path_unref (target_local_path);
+
+ /* target path is the same for non-toplevel trash */
+ if (G_LIKELY (succeed))
+ *target_path_return = thunar_vfs_path_ref (target_path);
+ }
+ }
+ else /* copying to the toplevel trash folder */
+ {
+ /* generate a new .trashinfo file */
+ if (_thunar_vfs_io_trash_new_trash_info (source_path, &trash_id, &file_id, error))
+ {
+ /* determine the new target path in the trash */
+ target_path = _thunar_vfs_io_trash_path_new (trash_id, file_id, "");
+
+ /* translate the target path to a local path */
+ target_local_path = _thunar_vfs_path_translate (target_path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_LIKELY (target_local_path != NULL))
+ {
+ /* try to copy the file info the trash (ensuring that the "files" directory exists) */
+ succeed = (_thunar_vfs_io_ops_mkdir (target_local_path->parent, 0700, THUNAR_VFS_IO_OPS_IGNORE_EEXIST, error)
+ && _thunar_vfs_io_ops_copy_file (source_path, target_local_path, NULL, callback, callback_data, error));
+ thunar_vfs_path_unref (target_local_path);
+ }
+
+ /* check if we failed */
+ if (G_UNLIKELY (!succeed))
+ {
+ /* drop the file from the trash and release the target path */
+ if (!_thunar_vfs_io_trash_remove (target_path, NULL))
+ g_warning ("Failed to remove stale trash handle %s in %u", file_id, trash_id);
+ thunar_vfs_path_unref (target_path);
+ }
+ else
+ {
+ /* schedule a changed notification on the trash root folder (parent of this path) */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CHANGED, target_path->parent);
+
+ /* return the new target path */
+ *target_path_return = target_path;
+ }
+
+ /* cleanup */
+ g_free (file_id);
+ }
+ }
+
+ return succeed;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_move_file:
+ * @source_path : the #ThunarVfsPath of the source file.
+ * @target_path : the #ThunarVfsPath of the target location.
+ * @target_path_return : return location for the final #ThunarVfsPath to which
+ * the file was moved.
+ * @error : return location for errors or %NULL.
+ *
+ * Moves a file from or to the trash. Cannot currently handle moving files
+ * within the trash.
+ *
+ * See the description of _thunar_vfs_io_ops_move_file() for further details.
+ *
+ * Return value: %TRUE if succeed, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_io_trash_move_file (ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ GError **error)
+{
+ ThunarVfsPath *source_local_path;
+ ThunarVfsPath *target_local_path;
+ gboolean succeed = FALSE;
+ gchar *file_id;
+ guint trash_id;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (source_path) || _thunar_vfs_path_is_trash (target_path), FALSE);
+ _thunar_vfs_return_val_if_fail (!thunar_vfs_path_is_root (source_path), FALSE);
+ _thunar_vfs_return_val_if_fail (!thunar_vfs_path_is_root (target_path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (target_path_return != NULL, FALSE);
+
+ /* check if we're moving to or from the trash */
+ if (_thunar_vfs_path_is_trash (source_path) && _thunar_vfs_path_is_trash (target_path))
+ {
+ /* we don't support moving files within the trash */
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_IO, _("Cannot move or copy files within the trash"));
+ }
+ else if (_thunar_vfs_path_is_trash (source_path)) /* moving out of the trash */
+ {
+ /* translate the source path to a local path */
+ source_local_path = _thunar_vfs_path_translate (source_path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_LIKELY (source_local_path != NULL))
+ {
+ /* try to move the file out of the trash and remove the associated .trashinfo file */
+ succeed = (_thunar_vfs_io_local_move_file (source_local_path, target_path, error)
+ && _thunar_vfs_io_trash_remove (source_path, error));
+ thunar_vfs_path_unref (source_local_path);
+
+ /* target path is the same for local paths */
+ if (G_LIKELY (succeed))
+ *target_path_return = thunar_vfs_path_ref (target_path);
+ }
+ }
+ else if (!thunar_vfs_path_is_root (target_path->parent)) /* moving into a trash subfolder */
+ {
+ /* translate the target path to a local path */
+ target_local_path = _thunar_vfs_path_translate (target_path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_LIKELY (target_local_path != NULL))
+ {
+ /* try to move the file into the trash */
+ succeed = _thunar_vfs_io_local_move_file (source_path, target_local_path, error);
+ thunar_vfs_path_unref (target_local_path);
+
+ /* target path is the same for non-toplevel trash */
+ if (G_LIKELY (succeed))
+ *target_path_return = thunar_vfs_path_ref (target_path);
+ }
+ }
+ else /* moving to the toplevel trash folder */
+ {
+ /* generate a new .trashinfo file */
+ if (_thunar_vfs_io_trash_new_trash_info (source_path, &trash_id, &file_id, error))
+ {
+ /* determine the new target path in the trash */
+ target_path = _thunar_vfs_io_trash_path_new (trash_id, file_id, "");
+
+ /* translate the target path to a local path */
+ target_local_path = _thunar_vfs_path_translate (target_path, THUNAR_VFS_PATH_SCHEME_FILE, error);
+ if (G_LIKELY (target_local_path != NULL))
+ {
+ /* try to move the file info the trash (ensuring that the "files" directory exists) */
+ succeed = (_thunar_vfs_io_ops_mkdir (target_local_path->parent, 0700, THUNAR_VFS_IO_OPS_IGNORE_EEXIST, error)
+ && _thunar_vfs_io_local_move_file (source_path, target_local_path, error));
+ thunar_vfs_path_unref (target_local_path);
+ }
+
+ /* check if we failed */
+ if (G_UNLIKELY (!succeed))
+ {
+ /* drop the file from the trash and release the target path */
+ if (!_thunar_vfs_io_trash_remove (target_path, NULL))
+ g_warning ("Failed to remove stale trash handle %s in %u", file_id, trash_id);
+ thunar_vfs_path_unref (target_path);
+ }
+ else
+ {
+ /* schedule a changed notification on the trash root folder (parent of this path) */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CHANGED, target_path->parent);
+
+ /* return the new target path */
+ *target_path_return = target_path;
+ }
+
+ /* cleanup */
+ g_free (file_id);
+ }
+ }
+
+ return succeed;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_remove:
+ * @path : the #ThunarVfsPath to the trash resource to remove.
+ * @error : return location for errors or %NULL.
+ *
+ * Removes the file or folder from the trash that is identified
+ * by the specified @path.
+ *
+ * Return value: %TRUE if the removal was successfull, %FALSE
+ * otherwise.
+ **/
+gboolean
+_thunar_vfs_io_trash_remove (ThunarVfsPath *path,
+ GError **error)
+{
+ GError *err = NULL;
+ gchar *absolute_path;
+ gchar *relative_path;
+ gchar *trash_dir;
+ gchar *file_id;
+ guint trash_id;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (path), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* try to parse the trash path */
+ if (!_thunar_vfs_io_trash_path_parse (path, &trash_id, &file_id, &relative_path, error))
+ return FALSE;
+
+ /* determine the trash directory for the trash-id */
+ trash_dir = _thunar_vfs_io_trash_get_trash_dir (trash_id, &err);
+ if (G_LIKELY (trash_dir != NULL))
+ {
+ /* try to remove the file or folder in the trash */
+ absolute_path = g_build_filename (trash_dir, "files", file_id, relative_path, NULL);
+ if (g_remove (absolute_path) < 0 && errno != ENOENT)
+ _thunar_vfs_set_g_error_from_errno (&err, errno);
+ g_free (absolute_path);
+
+ /* check if need to remove the matching .trashinfo file */
+ if (G_LIKELY (err == NULL) && relative_path == NULL)
+ {
+ /* determine the path for the .trashinfo file and unlink it (ignoring errors) */
+ absolute_path = g_strconcat (trash_dir, G_DIR_SEPARATOR_S "info" G_DIR_SEPARATOR_S, file_id, ".trashinfo", NULL);
+ g_unlink (absolute_path);
+ g_free (absolute_path);
+
+ /* schedule a changed notification on the trash root folder (parent of this path) */
+ thunar_vfs_monitor_feed (_thunar_vfs_monitor, THUNAR_VFS_MONITOR_EVENT_CHANGED, path->parent);
+ }
+ }
+
+ /* cleanup */
+ g_free (relative_path);
+ g_free (trash_dir);
+ g_free (file_id);
+
+ /* check if we failed */
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_scandir:
+ * @path : the #ThunarVfsPath to a directory in the trash. May
+ * also be the trash root folder itself.
+ * @follow_links : %TRUE to follow symlinks to directories.
+ * @directories_return : pointer to a list into which the direct subfolders
+ * found during scanning will be placed (for recursive
+ * scanning), or %NULL if you are not interested in a
+ * separate list of subfolders. Note that the returned
+ * list items need to be freed, but the #ThunarVfsPath<!---->s
+ * in the list do not have an extra reference.
+ * @error : return location for errors or %NULL.
+ *
+ * Scans the trash directory at @path and returns the #ThunarVfsPath<!---->s in the
+ * directory.
+ *
+ * The list returned in @directories_return, if not %NULL, must be freed using
+ * g_list_free() when no longer needed.
+ *
+ * The returned list of #ThunarVfsPath<!---->s must be freed by the caller using
+ * thunar_vfs_path_list_unref() when no longer needed.
+ *
+ * Return value: the list of #ThunarVfsPath<!---->s in the folder at the @path,
+ * or %NULL in case of an error. Note that %NULL may also mean that
+ * the folder is empty.
+ **/
+GList*
+_thunar_vfs_io_trash_scandir (ThunarVfsPath *path,
+ gboolean follow_links,
+ GList **directories_return,
+ GError **error)
+{
+ const gchar *name;
+ gchar *absolute_path;
+ gchar *file_path;
+ GList *path_list = NULL;
+ guint n;
+ GDir *dp;
+
+ _thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (path), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* scanning a directory in the trash is easy */
+ if (!thunar_vfs_path_is_root (path))
+ {
+ /* determine the absolute local path to the directory */
+ absolute_path = _thunar_vfs_io_trash_path_resolve (path, error);
+ if (G_LIKELY (absolute_path != NULL))
+ {
+ /* scan the local directory, generating trash paths */
+ path_list = _thunar_vfs_os_scandir (path, absolute_path, follow_links, directories_return, error);
+ g_free (absolute_path);
+ }
+ }
+ else
+ {
+ /* unconditionally rescan the trash directories */
+ _thunar_vfs_io_trash_rescan ();
+
+ /* acquire the trash subsystem lock */
+ G_LOCK (_thunar_vfs_io_trash);
+
+ /* process all trash directories */
+ for (n = 0; n < _thunar_vfs_io_n_trashes; ++n)
+ {
+ /* determine the paths for the trashed files in this trash directory */
+ absolute_path = g_build_filename (_thunar_vfs_io_trashes[n].trash_dir, "files", NULL);
+ dp = g_dir_open (absolute_path, 0, NULL);
+ if (G_LIKELY (dp != NULL))
+ {
+ /* process all items in this folder */
+ for (;;)
+ {
+ /* determine the name of the next item */
+ name = g_dir_read_name (dp);
+ if (G_UNLIKELY (name == NULL))
+ break;
+
+ /* add a path for this item */
+ path_list = g_list_prepend (path_list, _thunar_vfs_io_trash_path_new (n, name, ""));
+
+ /* check if we should return directories in a special list */
+ if (G_UNLIKELY (directories_return != NULL))
+ {
+ /* check if we have a directory (according to the follow_links policy) */
+ file_path = g_build_filename (absolute_path, name, NULL);
+ if (g_file_test (file_path, G_FILE_TEST_IS_DIR) && (follow_links || !g_file_test (file_path, G_FILE_TEST_IS_SYMLINK)))
+ *directories_return = g_list_prepend (*directories_return, path_list->data);
+ g_free (file_path);
+ }
+ }
+ g_dir_close (dp);
+ }
+ g_free (absolute_path);
+ }
+
+ /* release the trash subsystem lock */
+ G_UNLOCK (_thunar_vfs_io_trash);
+ }
+
+ return path_list;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_init:
+ *
+ * Initializes the trash subsystem.
+ **/
+void
+_thunar_vfs_io_trash_init (void)
+{
+ /* setup the home trash */
+ _thunar_vfs_io_n_trashes = 1;
+ _thunar_vfs_io_trashes = g_new (ThunarVfsIOTrash, 1);
+ _thunar_vfs_io_trashes->top_dir = g_strdup (g_get_home_dir ());
+ _thunar_vfs_io_trashes->trash_dir = g_build_filename (g_get_user_data_dir (), "Trash", NULL);
+ _thunar_vfs_io_trashes->mtime = 0;
+ _thunar_vfs_io_trashes->empty = TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_io_trash_shutdown:
+ *
+ * Shuts down the trash subsystem.
+ **/
+void
+_thunar_vfs_io_trash_shutdown (void)
+{
+ /* check if we have a pending trash rescan timer */
+ if (G_LIKELY (_thunar_vfs_io_trash_timer_id >= 0))
+ {
+ /* kill the pending trash rescan timer */
+ g_source_remove (_thunar_vfs_io_trash_timer_id);
+ _thunar_vfs_io_trash_timer_id = -1;
+ }
+
+ /* free the active trashes */
+ while (_thunar_vfs_io_n_trashes-- > 0)
+ {
+ /* release top and trash dir */
+ g_free (_thunar_vfs_io_trashes[_thunar_vfs_io_n_trashes].top_dir);
+ g_free (_thunar_vfs_io_trashes[_thunar_vfs_io_n_trashes].trash_dir);
+ }
+ g_free (_thunar_vfs_io_trashes);
+ _thunar_vfs_io_trashes = NULL;
+}
+
+
+
+#define __THUNAR_VFS_IO_TRASH_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-io-trash.h b/thunar-vfs/thunar-vfs-io-trash.h
new file mode 100644
index 0000000000000000000000000000000000000000..c1e91fb2c9a7ce587c704d75832ac1488e177808
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-io-trash.h
@@ -0,0 +1,91 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_IO_TRASH_H__
+#define __THUNAR_VFS_IO_TRASH_H__
+
+#include <thunar-vfs/thunar-vfs-info.h>
+#include <thunar-vfs/thunar-vfs-io-ops.h>
+
+G_BEGIN_DECLS;
+
+void _thunar_vfs_io_trash_scan (void) G_GNUC_INTERNAL;
+gboolean _thunar_vfs_io_trash_rescan (void) G_GNUC_INTERNAL;
+
+gchar *_thunar_vfs_io_trash_get_top_dir (guint trash_id,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar *_thunar_vfs_io_trash_get_trash_dir (guint trash_id,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_trash_get_trash_info (const ThunarVfsPath *path,
+ gchar **original_path_return,
+ gchar **deletion_date_return,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+gboolean _thunar_vfs_io_trash_new_trash_info (const ThunarVfsPath *original_path,
+ guint *trash_id_return,
+ gchar **file_id_return,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+ThunarVfsPath *_thunar_vfs_io_trash_path_new (guint trash_id,
+ const gchar *file_id,
+ const gchar *relative_path) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_trash_path_parse (const ThunarVfsPath *path,
+ guint *trash_id_return,
+ gchar **file_id_return,
+ gchar **relative_path_return,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+gchar *_thunar_vfs_io_trash_path_resolve (const ThunarVfsPath *path,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+ThunarVfsInfo *_thunar_vfs_io_trash_get_info (ThunarVfsPath *path,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar *_thunar_vfs_io_trash_get_metadata (ThunarVfsPath *path,
+ ThunarVfsInfoMetadata metadata,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+GList *_thunar_vfs_io_trash_listdir (ThunarVfsPath *path,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_trash_copy_file (ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ ThunarVfsIOOpsProgressCallback callback,
+ gpointer callback_data,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_trash_move_file (ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+gboolean _thunar_vfs_io_trash_remove (ThunarVfsPath *path,
+ GError **error) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+GList *_thunar_vfs_io_trash_scandir (ThunarVfsPath *path,
+ gboolean follow_links,
+ GList **directories_return,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+void _thunar_vfs_io_trash_init (void) G_GNUC_INTERNAL;
+void _thunar_vfs_io_trash_shutdown (void) G_GNUC_INTERNAL;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_IO_TRASH_H__ */
diff --git a/thunar-vfs/thunar-vfs-job-private.h b/thunar-vfs/thunar-vfs-job-private.h
new file mode 100644
index 0000000000000000000000000000000000000000..624edd1dd52fe433947aaf9b9984b385a4149731
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-job-private.h
@@ -0,0 +1,89 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_JOB_PRIVATE_H__
+#define __THUNAR_VFS_JOB_PRIVATE_H__
+
+#include <thunar-vfs/thunar-vfs-config.h>
+#include <thunar-vfs/thunar-vfs-job.h>
+
+G_BEGIN_DECLS;
+
+/* generic routines for synchronous signal emission */
+void _thunar_vfs_job_emit_valist (ThunarVfsJob *job,
+ guint signal_id,
+ GQuark signal_detail,
+ va_list var_args) G_GNUC_INTERNAL;
+void _thunar_vfs_job_emit (ThunarVfsJob *job,
+ guint signal_id,
+ GQuark signal_detail,
+ ...) G_GNUC_INTERNAL;
+
+/* generic routines for asynchronous signal emission */
+void _thunar_vfs_job_notify_valist (ThunarVfsJob *job,
+ guint signal_id,
+ GQuark signal_detail,
+ va_list var_args) G_GNUC_INTERNAL;
+void _thunar_vfs_job_notify (ThunarVfsJob *job,
+ guint signal_id,
+ GQuark signal_detail,
+ ...) G_GNUC_INTERNAL;
+
+/* special routines for signal emission */
+ThunarVfsJobResponse _thunar_vfs_job_ask_valist (ThunarVfsJob *job,
+ const gchar *format,
+ va_list var_args,
+ const gchar *question,
+ ThunarVfsJobResponse choices) G_GNUC_INTERNAL;
+ThunarVfsJobResponse _thunar_vfs_job_ask_overwrite (ThunarVfsJob *job,
+ const gchar *format,
+ ...) G_GNUC_INTERNAL G_GNUC_PRINTF (2, 3);
+gboolean _thunar_vfs_job_ask_skip (ThunarVfsJob *job,
+ const gchar *format,
+ ...) G_GNUC_INTERNAL G_GNUC_PRINTF (2, 3);
+void _thunar_vfs_job_error (ThunarVfsJob *job,
+ GError *error) G_GNUC_INTERNAL;
+void _thunar_vfs_job_info_message (ThunarVfsJob *job,
+ const gchar *format,
+ ...) G_GNUC_INTERNAL G_GNUC_PRINTF (2, 3);
+gboolean _thunar_vfs_job_infos_ready (ThunarVfsJob *job,
+ GList *info_list) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+void _thunar_vfs_job_new_files (ThunarVfsJob *job,
+ const GList *path_list) G_GNUC_INTERNAL;
+void _thunar_vfs_job_percent (ThunarVfsJob *job,
+ gdouble percent) G_GNUC_INTERNAL;
+
+/* special routines for path based jobs */
+void _thunar_vfs_job_total_paths (ThunarVfsJob *job,
+ GList *total_paths) G_GNUC_INTERNAL;
+void _thunar_vfs_job_process_path (ThunarVfsJob *job,
+ GList *path_list_item) G_GNUC_INTERNAL;
+
+/* initialization and shutdown routines */
+void _thunar_vfs_job_init (void) G_GNUC_INTERNAL;
+void _thunar_vfs_job_shutdown (void) G_GNUC_INTERNAL;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_JOB_PRIVATE_H__ */
diff --git a/thunar-vfs/thunar-vfs-job.c b/thunar-vfs/thunar-vfs-job.c
index 530115f25800dcaa890ed589aad540fc0261c6a2..a66be5610de92a1a16763cc4b98af8f9ba4b88fb 100644
--- a/thunar-vfs/thunar-vfs-job.c
+++ b/thunar-vfs/thunar-vfs-job.c
@@ -34,6 +34,13 @@
#define __THUNAR_VFS_JOB_C__
#include <thunar-vfs/thunar-vfs-job.h>
+#include <gobject/gvaluecollector.h>
+
+#include <thunar-vfs/thunar-vfs-enum-types.h>
+#include <thunar-vfs/thunar-vfs-job-private.h>
+#include <thunar-vfs/thunar-vfs-marshal.h>
+#include <thunar-vfs/thunar-vfs-monitor-private.h>
+#include <thunar-vfs/thunar-vfs-path-private.h>
#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
@@ -47,41 +54,67 @@
/* Signal identifiers */
enum
{
+ ASK,
ERROR,
FINISHED,
+ INFO_MESSAGE,
+ INFOS_READY,
+ NEW_FILES,
+ PERCENT,
LAST_SIGNAL,
};
-typedef struct _ThunarVfsJobEmitDetails ThunarVfsJobEmitDetails;
-typedef struct _ThunarVfsJobSource ThunarVfsJobSource;
+typedef struct _ThunarVfsJobEmitAsync ThunarVfsJobEmitAsync;
+typedef struct _ThunarVfsJobEmitSync ThunarVfsJobEmitSync;
+typedef struct _ThunarVfsJobSource ThunarVfsJobSource;
-static void thunar_vfs_job_class_init (ThunarVfsJobClass *klass);
-static void thunar_vfs_job_init (ThunarVfsJob *job);
-static void thunar_vfs_job_execute (gpointer data,
- gpointer user_data);
-static gboolean thunar_vfs_job_source_prepare (GSource *source,
- gint *timeout);
-static gboolean thunar_vfs_job_source_check (GSource *source);
-static gboolean thunar_vfs_job_source_dispatch (GSource *source,
- GSourceFunc callback,
- gpointer user_data);
-static void thunar_vfs_job_source_finalize (GSource *source);
+static void thunar_vfs_job_class_init (ThunarVfsJobClass *klass);
+static void thunar_vfs_job_init (ThunarVfsJob *job);
+static ThunarVfsJobResponse thunar_vfs_job_real_ask (ThunarVfsJob *job,
+ const gchar *message,
+ ThunarVfsJobResponse choices);
+static void thunar_vfs_job_execute (gpointer data,
+ gpointer user_data);
+static gboolean thunar_vfs_job_source_prepare (GSource *source,
+ gint *timeout);
+static gboolean thunar_vfs_job_source_check (GSource *source);
+static gboolean thunar_vfs_job_source_dispatch (GSource *source,
+ GSourceFunc callback,
+ gpointer user_data);
+static void thunar_vfs_job_source_finalize (GSource *source);
struct _ThunarVfsJobPrivate
{
- ThunarVfsJobEmitDetails *details;
- gboolean running;
+ ThunarVfsJobEmitAsync *emit_async;
+ ThunarVfsJobEmitSync *emit_sync;
+ gboolean running;
+
+ /* for ask_overwrite()/ask_skip() */
+ guint ask_overwrite_all : 1;
+ guint ask_overwrite_none : 1;
+ guint ask_skip_all : 1;
+
+ /* for total_paths()/process_path() */
+ GList *total_paths;
+};
+
+struct _ThunarVfsJobEmitAsync /* an asychronous notification */
+{
+ ThunarVfsJobEmitAsync *next;
+ guint signal_id;
+ GQuark signal_detail;
+ guint n_values;
+ GValue *values;
};
-struct _ThunarVfsJobEmitDetails
+struct _ThunarVfsJobEmitSync /* a synchronous signal */
{
- ThunarVfsJob *job;
guint signal_id;
GQuark signal_detail;
va_list var_args;
@@ -135,6 +168,18 @@ thunar_vfs_job_get_type (void)
+static gboolean
+_thunar_vfs_job_ask_accumulator (GSignalInvocationHint *ihint,
+ GValue *return_accu,
+ const GValue *handler_return,
+ gpointer data)
+{
+ g_value_copy (handler_return, return_accu);
+ return FALSE;
+}
+
+
+
static void
thunar_vfs_job_class_init (ThunarVfsJobClass *klass)
{
@@ -144,6 +189,29 @@ thunar_vfs_job_class_init (ThunarVfsJobClass *klass)
/* determine the parent class */
thunar_vfs_job_parent_class = g_type_class_peek_parent (klass);
+ klass->ask = thunar_vfs_job_real_ask;
+
+ /**
+ * ThunarVfsInteractiveJob::ask:
+ * @job : a #ThunarVfsJob.
+ * @message : question to display to the user.
+ * @choices : a combination of #ThunarVfsInteractiveJobResponse<!---->s.
+ *
+ * The @message is garantied to contain valid UTF-8.
+ *
+ * Return value: the selected choice.
+ **/
+ job_signals[ASK] =
+ g_signal_new (I_("ask"),
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_NO_HOOKS | G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ThunarVfsJobClass, ask),
+ _thunar_vfs_job_ask_accumulator, NULL,
+ _thunar_vfs_marshal_FLAGS__STRING_FLAGS,
+ THUNAR_VFS_TYPE_VFS_JOB_RESPONSE,
+ 2, G_TYPE_STRING,
+ THUNAR_VFS_TYPE_VFS_JOB_RESPONSE);
+
/**
* ThunarVfsJob::error:
* @job : a #ThunarVfsJob.
@@ -174,6 +242,95 @@ thunar_vfs_job_class_init (ThunarVfsJobClass *klass)
G_SIGNAL_NO_HOOKS, 0, NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+
+ /**
+ * ThunarVfsJob::info-message:
+ * @job : a #ThunarVfsJob.
+ * @message : information to be displayed about @job.
+ *
+ * This signal is emitted to display information about the
+ * @job. Examples of messages are "Preparing..." or
+ * "Cleaning up...".
+ *
+ * The @message is garantied to contain valid UTF-8, so
+ * it can be displayed by #GtkWidget<!---->s out of the
+ * box.
+ **/
+ job_signals[INFO_MESSAGE] =
+ g_signal_new (I_("info-message"),
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_NO_HOOKS, 0, NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+
+ /**
+ * ThunarVfsJob::infos-ready:
+ * @job : a #ThunarVfsJob.
+ * @info_list : a list of #ThunarVfsInfo<!---->s.
+ *
+ * This signal is used by #ThunarVfsJob<!---->s returned by
+ * the thunar_vfs_listdir() function whenever there's a bunch
+ * of #ThunarVfsInfo<!---->s ready. This signal is garantied
+ * to be never emitted with an @info_list parameter of %NULL.
+ *
+ * To allow some further optimizations on the handler-side,
+ * the handler is allowed to take over ownership of the
+ * @info_list, i.e. it can reuse the @infos list and just replace
+ * the data elements with it's own objects based on the
+ * #ThunarVfsInfo<!--->s contained within the @info_list (and
+ * of course properly unreffing the previously contained infos).
+ * If a handler takes over ownership of @info_list it must return
+ * %TRUE here, and no further handlers will be run. Else, if
+ * the handler doesn't want to take over ownership of @infos,
+ * it must return %FALSE, and other handlers will be run. Use
+ * this feature with care, and only if you can be sure that
+ * you are the only handler connected to this signal for a
+ * given job!
+ *
+ * Return value: %TRUE if the handler took over ownership of
+ * @info_list, else %FALSE.
+ **/
+ job_signals[INFOS_READY] =
+ g_signal_new (I_("infos-ready"),
+ G_TYPE_FROM_CLASS (klass), G_SIGNAL_NO_HOOKS,
+ 0, g_signal_accumulator_true_handled, NULL,
+ _thunar_vfs_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
+
+ /**
+ * ThunarVfsJob::new-files:
+ * @job : a #ThunarVfsJob.
+ * @path_list : a list of #ThunarVfsPath<!---->s that were created by @job.
+ *
+ * This signal is emitted by the @job right before the @job is terminated
+ * and informs the application about the list of created files in @path_list.
+ * @path_list contains only the toplevel path items, that were specified by
+ * the application on creation of the @job.
+ **/
+ job_signals[NEW_FILES] =
+ g_signal_new (I_("new-files"),
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_NO_HOOKS, 0, NULL, NULL,
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+ /**
+ * ThunarVfsJob::percent:
+ * @job : a #ThunarVfsJob.
+ * @percent : the percentage of completeness.
+ *
+ * This signal is emitted to present the state
+ * of the overall progress.
+ *
+ * The @percent value is garantied to be in the
+ * range 0.0 to 100.0.
+ **/
+ job_signals[PERCENT] =
+ g_signal_new (I_("percent"),
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_NO_HOOKS, 0, NULL, NULL,
+ g_cclosure_marshal_VOID__DOUBLE,
+ G_TYPE_NONE, 1, G_TYPE_DOUBLE);
}
@@ -186,11 +343,22 @@ thunar_vfs_job_init (ThunarVfsJob *job)
+static ThunarVfsJobResponse
+thunar_vfs_job_real_ask (ThunarVfsJob *job,
+ const gchar *message,
+ ThunarVfsJobResponse choices)
+{
+ return THUNAR_VFS_JOB_RESPONSE_CANCEL;
+}
+
+
+
static void
thunar_vfs_job_execute (gpointer data,
gpointer user_data)
{
- ThunarVfsJob *job = THUNAR_VFS_JOB (data);
+ ThunarVfsJobEmitAsync *emit_async;
+ ThunarVfsJob *job = THUNAR_VFS_JOB (data);
g_return_if_fail (THUNAR_VFS_IS_JOB (job));
g_return_if_fail (job->priv->running);
@@ -201,6 +369,16 @@ thunar_vfs_job_execute (gpointer data,
/* mark the job as done */
job->priv->running = FALSE;
+ /* release pending asynchronous emissions */
+ while (job->priv->emit_async)
+ {
+ /* drop the first asynchronous emission */
+ emit_async = job->priv->emit_async;
+ job->priv->emit_async = emit_async->next;
+ _thunar_vfs_g_value_array_free (emit_async->values, emit_async->n_values);
+ _thunar_vfs_slice_free (ThunarVfsJobEmitAsync, emit_async);
+ }
+
/* wake up the main event loop */
g_main_context_wakeup (NULL);
}
@@ -218,7 +396,8 @@ thunar_vfs_job_source_prepare (GSource *source,
}
else
{
- *timeout = -1;
+ /* need to check for async emissions */
+ *timeout = 200;
return FALSE;
}
}
@@ -230,8 +409,10 @@ thunar_vfs_job_source_check (GSource *source)
{
ThunarVfsJob *job = THUNAR_VFS_JOB_SOURCE (source)->job;
- /* check if the job is done or has a pending emit */
- return (!job->priv->running || job->priv->details != NULL);
+ /* check if the job is done or has a pending async or sync emission */
+ return (!job->priv->running
+ || job->priv->emit_async != NULL
+ || job->priv->emit_sync != NULL);
}
@@ -241,8 +422,28 @@ thunar_vfs_job_source_dispatch (GSource *source,
GSourceFunc callback,
gpointer user_data)
{
- ThunarVfsJobEmitDetails *details;
- ThunarVfsJob *job = THUNAR_VFS_JOB_SOURCE (source)->job;
+ ThunarVfsJobEmitAsync *emit_async;
+ ThunarVfsJobEmitSync *emit_sync;
+ ThunarVfsJob *job = THUNAR_VFS_JOB_SOURCE (source)->job;
+
+ /* process all pending async signal emissions */
+ while (job->priv->emit_async != NULL)
+ {
+ /* remove the first async emission from the list */
+ g_mutex_lock (job_mutex);
+ emit_async = job->priv->emit_async;
+ job->priv->emit_async = emit_async->next;
+ g_mutex_unlock (job_mutex);
+
+ /* emit the asynchronous signal */
+ GDK_THREADS_ENTER ();
+ g_signal_emitv (emit_async->values, emit_async->signal_id, emit_async->signal_detail, NULL);
+ GDK_THREADS_LEAVE ();
+
+ /* release the async signal descriptor */
+ _thunar_vfs_g_value_array_free (emit_async->values, emit_async->n_values);
+ _thunar_vfs_slice_free (ThunarVfsJobEmitAsync, emit_async);
+ }
/* check if the job is done */
if (!job->priv->running)
@@ -256,23 +457,23 @@ thunar_vfs_job_source_dispatch (GSource *source,
return FALSE;
}
- /* check if the job has a pending emit */
- if (G_LIKELY (job->priv->details != NULL))
+ /* check if the job has a pending synchronous emission */
+ if (G_LIKELY (job->priv->emit_sync != NULL))
{
- /* acquire the job mutex */
- g_mutex_lock (job_mutex);
-
/* determine and reset the emission details */
- details = job->priv->details;
- job->priv->details = NULL;
+ g_mutex_lock (job_mutex);
+ emit_sync = job->priv->emit_sync;
+ job->priv->emit_sync = NULL;
+ g_mutex_unlock (job_mutex);
/* emit the signal */
GDK_THREADS_ENTER ();
- g_signal_emit_valist (job, details->signal_id, details->signal_detail, details->var_args);
+ g_signal_emit_valist (job, emit_sync->signal_id, emit_sync->signal_detail, emit_sync->var_args);
GDK_THREADS_LEAVE ();
/* tell the other thread, that we're done */
- details->pending = FALSE;
+ g_mutex_lock (job_mutex);
+ emit_sync->pending = FALSE;
g_cond_broadcast (job_cond);
g_mutex_unlock (job_mutex);
}
@@ -367,7 +568,7 @@ thunar_vfs_job_cancel (ThunarVfsJob *job)
/**
- * thunar_vfs_job_emit_valist:
+ * _thunar_vfs_job_emit_valist:
* @job : a #ThunarVfsJob.
* @signal_id : the id of the signal to emit on @job.
* @signal_detail : the detail.
@@ -381,31 +582,30 @@ thunar_vfs_job_cancel (ThunarVfsJob *job)
* return until the signal was emitted.
**/
void
-thunar_vfs_job_emit_valist (ThunarVfsJob *job,
- guint signal_id,
- GQuark signal_detail,
- va_list var_args)
+_thunar_vfs_job_emit_valist (ThunarVfsJob *job,
+ guint signal_id,
+ GQuark signal_detail,
+ va_list var_args)
{
- ThunarVfsJobEmitDetails details;
+ ThunarVfsJobEmitSync emit_sync;
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (job->priv->details == NULL);
- g_return_if_fail (job->priv->running);
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_vfs_return_if_fail (job->priv->emit_sync == NULL);
+ _thunar_vfs_return_if_fail (job->priv->running);
- /* prepare the emission details */
- details.job = job;
- details.signal_id = signal_id;
- details.signal_detail = signal_detail;
- details.pending = TRUE;
+ /* prepare the synchronous emission */
+ emit_sync.signal_id = signal_id;
+ emit_sync.signal_detail = signal_detail;
+ emit_sync.pending = TRUE;
/* copy the variable argument list (portable) */
- G_VA_COPY (details.var_args, var_args);
+ G_VA_COPY (emit_sync.var_args, var_args);
/* emit the signal using our source */
g_mutex_lock (job_mutex);
- job->priv->details = &details;
+ job->priv->emit_sync = &emit_sync;
g_main_context_wakeup (NULL);
- while (G_UNLIKELY (details.pending))
+ while (G_UNLIKELY (emit_sync.pending))
g_cond_wait (job_cond, job_mutex);
g_mutex_unlock (job_mutex);
}
@@ -413,7 +613,7 @@ thunar_vfs_job_emit_valist (ThunarVfsJob *job,
/**
- * thunar_vfs_job_emit:
+ * _thunar_vfs_job_emit:
* @job : a #ThunarVfsJob.
* @signal_id : the id of the signal to emit on qjob.
* @signal_detail : the signal detail.
@@ -422,22 +622,306 @@ thunar_vfs_job_emit_valist (ThunarVfsJob *job,
* Convenience wrapper for thunar_vfs_job_emit_valist().
**/
void
-thunar_vfs_job_emit (ThunarVfsJob *job,
- guint signal_id,
- GQuark signal_detail,
- ...)
+_thunar_vfs_job_emit (ThunarVfsJob *job,
+ guint signal_id,
+ GQuark signal_detail,
+ ...)
+{
+ va_list var_args;
+
+ va_start (var_args, signal_detail);
+ _thunar_vfs_job_emit_valist (job, signal_id, signal_detail, var_args);
+ va_end (var_args);
+}
+
+
+
+/**
+ * @job : a #ThunarVfsJob.
+ * @signal_id : the id of the signal to emit on @job.
+ * @signal_detail : the detail.
+ * @var_args : a list of paramters to be passed to the signal.
+ *
+ * Emits the signal identified by @signal_id on @job in
+ * the context of the main thread. This method returns
+ * immediately, and does not wait for the signal to be
+ * emitted.
+ **/
+void
+_thunar_vfs_job_notify_valist (ThunarVfsJob *job,
+ guint signal_id,
+ GQuark signal_detail,
+ va_list var_args)
+{
+ ThunarVfsJobEmitAsync *emit_async;
+ GSignalQuery signal_query;
+ gchar *error_message;
+ guint n;
+
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_vfs_return_if_fail (job->priv->running);
+
+ /* acquire the job subsystem lock */
+ g_mutex_lock (job_mutex);
+
+ /* check if we already have an async emission for the signal */
+ for (emit_async = job->priv->emit_async; emit_async != NULL; emit_async = emit_async->next)
+ if (emit_async->signal_id == signal_id && emit_async->signal_detail == signal_detail)
+ break;
+
+ /* override an existing emission */
+ if (G_UNLIKELY (emit_async != NULL))
+ {
+ /* release the previous values */
+ _thunar_vfs_g_value_array_free (emit_async->values, emit_async->n_values);
+ }
+ else
+ {
+ /* allocate a new asynchronous emission */
+ emit_async = _thunar_vfs_slice_new (ThunarVfsJobEmitAsync);
+ emit_async->signal_id = signal_id;
+ emit_async->signal_detail = signal_detail;
+
+ /* add to the list */
+ emit_async->next = job->priv->emit_async;
+ job->priv->emit_async = emit_async;
+ }
+
+ /* query the signal information */
+ g_signal_query (signal_id, &signal_query);
+
+ /* allocate the parameter values */
+ emit_async->n_values = signal_query.n_params + 1;
+ emit_async->values = g_new0 (GValue, emit_async->n_values);
+
+ /* initialize the job parameter */
+ g_value_init (emit_async->values, THUNAR_VFS_TYPE_JOB);
+ g_value_set_object (emit_async->values, job);
+
+ /* add the remaining parameters */
+ for (n = 0; n < signal_query.n_params; ++n)
+ {
+ /* collect the value from the stack */
+ g_value_init (emit_async->values + n + 1, signal_query.param_types[n]);
+ G_VALUE_COLLECT (emit_async->values + n + 1, var_args, 0, &error_message);
+
+ /* check if an error occurred */
+ if (G_UNLIKELY (error_message != NULL))
+ {
+ g_error ("%s: %s", G_STRLOC, error_message);
+ g_free (error_message);
+ }
+ }
+
+ /* release the job subsystem lock */
+ g_mutex_unlock (job_mutex);
+}
+
+
+
+/**
+ * _thunar_vfs_job_emit:
+ * @job : a #ThunarVfsJob.
+ * @signal_id : the id of the signal to emit on qjob.
+ * @signal_detail : the signal detail.
+ * @... : a list of parameters to be passed to the signal.
+ *
+ * Convenience wrapper for thunar_vfs_job_notify_valist().
+ **/
+void
+_thunar_vfs_job_notify (ThunarVfsJob *job,
+ guint signal_id,
+ GQuark signal_detail,
+ ...)
{
va_list var_args;
va_start (var_args, signal_detail);
- thunar_vfs_job_emit_valist (job, signal_id, signal_detail, var_args);
+ _thunar_vfs_job_notify_valist (job, signal_id, signal_detail, var_args);
+ va_end (var_args);
+}
+
+
+
+/**
+ * _thunar_vfs_job_ask_valist:
+ * @job : a #ThunarVfsJob.
+ * @format : a printf(3)-style format string.
+ * @var_args : argument list for the @format.
+ * @question : the question text to append or %NULL.
+ * @choices : the possible choices.
+ *
+ * Sends the formatted question to the @job owner and awaits
+ * its answer.
+ *
+ * Return value: the response from the @job owner.
+ **/
+ThunarVfsJobResponse
+_thunar_vfs_job_ask_valist (ThunarVfsJob *job,
+ const gchar *format,
+ va_list var_args,
+ const gchar *question,
+ ThunarVfsJobResponse choices)
+{
+ ThunarVfsJobResponse response;
+ gchar *message;
+ gchar *text;
+
+ _thunar_vfs_return_val_if_fail (g_utf8_validate (format, -1, NULL), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+
+ /* send the question and wait for the answer */
+ text = g_strdup_vprintf (format, var_args);
+ message = (question != NULL) ? g_strconcat (text, ".\n\n", question, NULL) : g_strconcat (text, ".", NULL);
+ _thunar_vfs_job_emit (job, job_signals[ASK], 0, message, choices, &response);
+ g_free (message);
+ g_free (text);
+
+ /* cancel the job as per users request */
+ if (G_UNLIKELY (response == THUNAR_VFS_JOB_RESPONSE_CANCEL))
+ thunar_vfs_job_cancel (job);
+
+ return response;
+}
+
+
+
+/**
+ * _thunar_vfs_job_ask_overwrite:
+ * @job : a #ThunarVfsJob.
+ * @format : a printf(3)-style format string.
+ * @... : arguments for the @format.
+ *
+ * Asks the user whether to overwrite a certain file as described by
+ * the specified @format string.
+ *
+ * The return value may be %THUNAR_VFS_JOB_RESPONSE_CANCEL if the user
+ * cancelled the @job, or %THUNAR_VFS_JOB_RESPONSE_YES if the user
+ * wants to overwrite or %THUNAR_VFS_JOB_RESPONSE_NO if the user wants
+ * to keep the file, which does not necessarily mean to cancel the
+ * @job (whether the @job will be cancelled depends on the semantics
+ * of the @job).
+ *
+ * Return value: the response of the user.
+ **/
+ThunarVfsJobResponse
+_thunar_vfs_job_ask_overwrite (ThunarVfsJob *job,
+ const gchar *format,
+ ...)
+{
+ ThunarVfsJobResponse response;
+ va_list var_args;
+
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+
+ /* check if the user already cancelled the job */
+ if (G_UNLIKELY (job->cancelled))
+ return THUNAR_VFS_JOB_RESPONSE_CANCEL;
+
+ /* check if the user said "Overwrite All" earlier */
+ if (G_UNLIKELY (job->priv->ask_overwrite_all))
+ return THUNAR_VFS_JOB_RESPONSE_YES;
+
+ /* check if the user said "Overwrite None" earlier */
+ if (G_UNLIKELY (job->priv->ask_overwrite_none))
+ return THUNAR_VFS_JOB_RESPONSE_NO;
+
+ /* ask the user using the provided format string */
+ va_start (var_args, format);
+ response = _thunar_vfs_job_ask_valist (job, format, var_args,
+ "Do you want to overwrite it?",
+ THUNAR_VFS_JOB_RESPONSE_YES
+ | THUNAR_VFS_JOB_RESPONSE_YES_ALL
+ | THUNAR_VFS_JOB_RESPONSE_NO
+ | THUNAR_VFS_JOB_RESPONSE_NO_ALL
+ | THUNAR_VFS_JOB_RESPONSE_CANCEL);
va_end (var_args);
+
+ /* translate the response */
+ switch (response)
+ {
+ case THUNAR_VFS_JOB_RESPONSE_YES_ALL:
+ job->priv->ask_overwrite_all = TRUE;
+ response = THUNAR_VFS_JOB_RESPONSE_YES;
+ break;
+
+ case THUNAR_VFS_JOB_RESPONSE_NO_ALL:
+ job->priv->ask_overwrite_none = TRUE;
+ response = THUNAR_VFS_JOB_RESPONSE_NO;
+ break;
+
+ default:
+ break;
+ }
+
+ return response;
}
/**
- * thunar_vfs_job_error:
+ * _thunar_vfs_job_ask_skip:
+ * @job : a #ThunarVfsJob.
+ * @format : a printf(3)-style format string.
+ * @... : arguments for the @format.
+ *
+ * Asks the user whether to skip a certain file as described by
+ * @format.
+ *
+ * The return value may be %TRUE to perform the skip, or %FALSE,
+ * which means to cancel the @job.
+ *
+ * Return value: %TRUE to skip or %FALSE to cancel the @job.
+ **/
+gboolean
+_thunar_vfs_job_ask_skip (ThunarVfsJob *job,
+ const gchar *format,
+ ...)
+{
+ ThunarVfsJobResponse response;
+ va_list var_args;
+
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
+
+ /* check if the user already cancelled the job */
+ if (G_UNLIKELY (job->cancelled))
+ return FALSE;
+
+ /* check if the user said "Skip All" earlier */
+ if (G_UNLIKELY (job->priv->ask_skip_all))
+ return TRUE;
+
+ /* ask the user using the provided format string */
+ va_start (var_args, format);
+ response = _thunar_vfs_job_ask_valist (job, format, var_args,
+ "Do you want to skip it?",
+ THUNAR_VFS_JOB_RESPONSE_YES
+ | THUNAR_VFS_JOB_RESPONSE_YES_ALL
+ | THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ va_end (var_args);
+
+ /* evaluate the response */
+ switch (response)
+ {
+ case THUNAR_VFS_JOB_RESPONSE_YES_ALL:
+ job->priv->ask_skip_all = TRUE;
+ /* FALL-THROUGH */
+
+ case THUNAR_VFS_JOB_RESPONSE_YES:
+ return TRUE;
+
+ case THUNAR_VFS_JOB_RESPONSE_CANCEL:
+ return FALSE;
+
+ default:
+ _thunar_vfs_assert_not_reached ();
+ return FALSE;
+ }
+}
+
+
+
+/**
+ * _thunar_vfs_job_error:
* @job : a #ThunarVfsJob.
* @error : a #GError describing the error cause.
*
@@ -447,17 +931,192 @@ thunar_vfs_job_emit (ThunarVfsJob *job,
* terminate instantly after emitting an error.
**/
void
-thunar_vfs_job_error (ThunarVfsJob *job,
- GError *error)
+_thunar_vfs_job_error (ThunarVfsJob *job,
+ GError *error)
{
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (error != NULL && error->message != NULL);
+ _thunar_vfs_return_if_fail (error != NULL && g_utf8_validate (error->message, -1, NULL));
+ _thunar_vfs_job_emit (job, job_signals[ERROR], 0, error);
+}
+
+
+
+/**
+ * _thunar_vfs_job_info_message:
+ * @job : a #ThunarVfsJob.
+ * @format : a printf(3)-style format string.
+ * @... : the format arguments.
+ *
+ * Emits the ::info-message signal on @job with the formatted
+ * info message.
+ **/
+void
+_thunar_vfs_job_info_message (ThunarVfsJob *job,
+ const gchar *format,
+ ...)
+{
+ va_list var_args;
+ gchar *message;
+
+ _thunar_vfs_return_if_fail (g_utf8_validate (format, -1, NULL));
+
+ va_start (var_args, format);
+ message = g_strdup_vprintf (format, var_args);
+ _thunar_vfs_job_notify (job, job_signals[INFO_MESSAGE], 0, message);
+ va_end (var_args);
+ g_free (message);
+}
+
+
+
+/**
+ * _thunar_vfs_job_infos_ready:
+ * @job : a #ThunarVfsJob.
+ * @info_list : a #GList of #ThunarVfsInfo<!---->s.
+ *
+ * Emits the ::infos-ready signal on @job with the given @info_list.
+ *
+ * Return value: %TRUE if any of the signal handlers took over
+ * ownership of the @info_list, %FALSE if the caller
+ * is responsible to free the @info_list.
+ **/
+gboolean
+_thunar_vfs_job_infos_ready (ThunarVfsJob *job,
+ GList *info_list)
+{
+ gboolean handled = FALSE;
+ _thunar_vfs_return_val_if_fail (info_list != NULL, FALSE);
+ _thunar_vfs_job_emit (job, job_signals[INFOS_READY], 0, info_list, &handled);
+ return handled;
+}
+
- thunar_vfs_job_emit (job, job_signals[ERROR], 0, error);
+
+/**
+ * thunar_vfs_job_new_files:
+ * @job : a #ThunarVfsJob.
+ * @path_list : the #ThunarVfsPath<!---->s that were created by the @job.
+ *
+ * Emits the ::new-files signal on @job with the @path_list.
+ **/
+void
+_thunar_vfs_job_new_files (ThunarVfsJob *job,
+ const GList *path_list)
+{
+ /* check if any paths were supplied */
+ if (G_LIKELY (path_list != NULL))
+ {
+ /* wait for the monitor to process all pending events */
+ thunar_vfs_monitor_wait (_thunar_vfs_monitor);
+
+ /* emit the new-files signal */
+ _thunar_vfs_job_emit (job, job_signals[NEW_FILES], 0, path_list);
+ }
}
+/**
+ * _thunar_vfs_job_percent:
+ * @job : a #ThunarVfsJob.
+ * @percent : the percentage of completion (in the range of 0.0 to 100.0).
+ *
+ * Emits the ::percent signal on @job with @percent.
+ **/
+void
+_thunar_vfs_job_percent (ThunarVfsJob *job,
+ gdouble percent)
+{
+ /* clamp the value to the range 0.0 to 100.0 */
+ if (G_UNLIKELY (percent < 0.0))
+ percent = 0.0;
+ else if (G_UNLIKELY (percent > 100.0))
+ percent = 100.0;
+
+ /* notify about the new percentage */
+ _thunar_vfs_job_notify (job, job_signals[PERCENT], 0, percent);
+}
+
+
+
+/**
+ * _thunar_vfs_job_total_paths:
+ * @job : a #ThunarVfsJob.
+ * @total_paths : the total #GList of #ThunarVfsPath<!---->s to be processed
+ * by the @job.
+ *
+ * Use this method for jobs that work based on #ThunarVfsPath<!---->s
+ * to initialize the total paths and item count.
+ *
+ * Afterwards call _thunar_vfs_job_process_path() for every path that
+ * you begin to process.
+ *
+ * The @total_paths list must be valid for all invocations of the
+ * _thunar_vfs_job_process_path() method, otherwise the behaviour
+ * will be undefined.
+ **/
+void
+_thunar_vfs_job_total_paths (ThunarVfsJob *job,
+ GList *total_paths)
+{
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ job->priv->total_paths = total_paths;
+}
+
+
+
+
+/**
+ * _thunar_vfs_job_process_path:
+ * @job : a #ThunarVfsJob.
+ * @path_list_item : the next #GList item in the list of
+ * #ThunarVfsPath<!---->s previously passed
+ * to _thunar_vfs_job_total_paths().
+ *
+ * Use this method after setting the path list using
+ * _thunar_vfs_job_total_paths() to update both the
+ * info message and the percent for the @job.
+ *
+ * @path_list_item must be a list item in the path list previously
+ * set via _thunar_vfs_job_total_paths().
+ **/
+void
+_thunar_vfs_job_process_path (ThunarVfsJob *job,
+ GList *path_list_item)
+{
+ GList *lp;
+ gchar *display_name;
+ guint n_processed;
+ guint n_total;
+
+ _thunar_vfs_return_if_fail (g_list_position (job->priv->total_paths, path_list_item) >= 0);
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_JOB (job));
+
+ /* update the info message to the path name */
+ display_name = _thunar_vfs_path_dup_display_name (path_list_item->data);
+ _thunar_vfs_job_info_message (job, display_name);
+ g_free (display_name);
+
+ /* verify that we have total_paths set */
+ if (G_LIKELY (job->priv->total_paths != NULL))
+ {
+ /* determine the number of processed paths */
+ for (lp = job->priv->total_paths, n_processed = 0; lp != path_list_item; lp = lp->next, ++n_processed)
+ ;
+
+ /* emit only if n_processed is a multiple of 8 */
+ if ((n_processed % 8) == 0)
+ {
+ /* determine the total number of paths */
+ for (n_total = n_processed; lp != NULL; lp = lp->next, ++n_total)
+ ;
+
+ /* update the progress status */
+ _thunar_vfs_job_percent (job, (n_processed * 100.0) / n_total);
+ }
+ }
+}
+
+
/**
* _thunar_vfs_job_init:
@@ -468,7 +1127,7 @@ thunar_vfs_job_error (ThunarVfsJob *job,
void
_thunar_vfs_job_init (void)
{
- g_return_if_fail (job_pool == NULL);
+ _thunar_vfs_return_if_fail (job_pool == NULL);
/* allocate the synchronization entities */
job_cond = g_cond_new ();
@@ -489,7 +1148,7 @@ _thunar_vfs_job_init (void)
void
_thunar_vfs_job_shutdown (void)
{
- g_return_if_fail (job_pool != NULL);
+ _thunar_vfs_return_if_fail (job_pool != NULL);
/* wait for all jobs to terminate */
while (G_UNLIKELY (jobs_running > 0))
diff --git a/thunar-vfs/thunar-vfs-job.h b/thunar-vfs/thunar-vfs-job.h
index ffcedb30da606fb4768b57df3b66881aad8e13dc..09bbe761539c33c5f52e4447ce2562e8f0819479 100644
--- a/thunar-vfs/thunar-vfs-job.h
+++ b/thunar-vfs/thunar-vfs-job.h
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -40,54 +40,61 @@ typedef struct _ThunarVfsJob ThunarVfsJob;
#define THUNAR_VFS_IS_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_JOB))
#define THUNAR_VFS_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_JOB, ThunarVfsJobClass))
+/**
+ * ThunarVfsJobResponse:
+ * @THUNAR_VFS_JOB_RESPONSE_YES :
+ * @THUNAR_VFS_JOB_RESPONSE_YES_ALL :
+ * @THUNAR_VFS_JOB_RESPONSE_NO :
+ * @THUNAR_VFS_JOB_RESPONSE_NO_ALL :
+ * @THUNAR_VFS_JOB_RESPONSE_CANCEL :
+ *
+ * Possible responses for the ThunarVfsJob::ask signal.
+ **/
+typedef enum /*< flags >*/
+{
+ THUNAR_VFS_JOB_RESPONSE_YES = 1 << 0,
+ THUNAR_VFS_JOB_RESPONSE_YES_ALL = 1 << 1,
+ THUNAR_VFS_JOB_RESPONSE_NO = 1 << 2,
+ THUNAR_VFS_JOB_RESPONSE_CANCEL = 1 << 3,
+ THUNAR_VFS_JOB_RESPONSE_NO_ALL = 1 << 4,
+} ThunarVfsJobResponse;
+
struct _ThunarVfsJobClass
{
+ /*< private >*/
GObjectClass __parent__;
+ /*< public >*/
+
/* virtual methods */
- void (*execute) (ThunarVfsJob *job);
+ void (*execute) (ThunarVfsJob *job);
/* signals */
- void (*finished) (ThunarVfsJob *job);
+ void (*finished) (ThunarVfsJob *job);
+ ThunarVfsJobResponse (*ask) (ThunarVfsJob *job,
+ const gchar *message,
+ ThunarVfsJobResponse choices);
/*< private >*/
void (*reserved1) (void);
void (*reserved2) (void);
void (*reserved3) (void);
- void (*reserved4) (void);
};
struct _ThunarVfsJob
{
- GObject __parent__;
-
/*< private >*/
+ GObject __parent__;
volatile gboolean cancelled;
ThunarVfsJobPrivate *priv;
};
GType thunar_vfs_job_get_type (void) G_GNUC_CONST;
-
-/* public API */
ThunarVfsJob *thunar_vfs_job_launch (ThunarVfsJob *job);
void thunar_vfs_job_cancel (ThunarVfsJob *job);
G_INLINE_FUNC gboolean thunar_vfs_job_cancelled (const ThunarVfsJob *job);
-
-/* module API */
-void thunar_vfs_job_emit_valist (ThunarVfsJob *job,
- guint signal_id,
- GQuark signal_detail,
- va_list var_args) G_GNUC_INTERNAL;
-void thunar_vfs_job_emit (ThunarVfsJob *job,
- guint signal_id,
- GQuark signal_detail,
- ...) G_GNUC_INTERNAL;
-void thunar_vfs_job_error (ThunarVfsJob *job,
- GError *error) G_GNUC_INTERNAL;
-
-
/* inline function implementations */
#if defined(G_CAN_INLINE) || defined(__THUNAR_VFS_JOB_C__)
/**
@@ -108,11 +115,6 @@ thunar_vfs_job_cancelled (const ThunarVfsJob *job)
#endif /* G_CAN_INLINE || __THUNAR_VFS_JOB_C__ */
-#if defined(THUNAR_VFS_COMPILATION)
-void _thunar_vfs_job_init (void) G_GNUC_INTERNAL;
-void _thunar_vfs_job_shutdown (void) G_GNUC_INTERNAL;
-#endif
-
G_END_DECLS;
#endif /* !__THUNAR_VFS_JOB_H__ */
diff --git a/thunar-vfs/thunar-vfs-link-job.c b/thunar-vfs/thunar-vfs-link-job.c
deleted file mode 100644
index 7e5b8d1b762f746873a693966b0d9301e900b50b..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-link-job.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <thunar-vfs/thunar-vfs-link-job.h>
-#include <thunar-vfs/thunar-vfs-private.h>
-#include <thunar-vfs/thunar-vfs-xfer.h>
-#include <thunar-vfs/thunar-vfs-alias.h>
-
-/* use g_unlink() on win32 */
-#if GLIB_CHECK_VERSION(2,6,0) && defined(G_OS_WIN32)
-#include <glib/gstdio.h>
-#else
-#define g_unlink(path) (unlink ((path)))
-#endif
-
-
-
-static void thunar_vfs_link_job_class_init (ThunarVfsLinkJobClass *klass);
-static void thunar_vfs_link_job_finalize (GObject *object);
-static void thunar_vfs_link_job_execute (ThunarVfsJob *job);
-
-
-
-struct _ThunarVfsLinkJobClass
-{
- ThunarVfsInteractiveJobClass __parent__;
-};
-
-struct _ThunarVfsLinkJob
-{
- ThunarVfsInteractiveJob __parent__;
-
- /* source and target path list */
- GList *source_path_list;
- GList *target_path_list;
-};
-
-
-
-static GObjectClass *thunar_vfs_link_job_parent_class;
-
-
-
-GType
-thunar_vfs_link_job_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_INTERACTIVE_JOB,
- "ThunarVfsLinkJob",
- sizeof (ThunarVfsLinkJobClass),
- thunar_vfs_link_job_class_init,
- sizeof (ThunarVfsLinkJob),
- NULL,
- 0);
- }
-
- return type;
-}
-
-
-
-static void
-thunar_vfs_link_job_class_init (ThunarVfsLinkJobClass *klass)
-{
- ThunarVfsJobClass *thunarvfs_job_class;
- GObjectClass *gobject_class;
-
- /* determine the parent class */
- thunar_vfs_link_job_parent_class = g_type_class_peek_parent (klass);
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = thunar_vfs_link_job_finalize;
-
- thunarvfs_job_class = THUNAR_VFS_JOB_CLASS (klass);
- thunarvfs_job_class->execute = thunar_vfs_link_job_execute;
-}
-
-
-
-static void
-thunar_vfs_link_job_finalize (GObject *object)
-{
- ThunarVfsLinkJob *link_job = THUNAR_VFS_LINK_JOB (object);
-
- /* release the target path list */
- thunar_vfs_path_list_free (link_job->target_path_list);
-
- /* release the source path list */
- thunar_vfs_path_list_free (link_job->source_path_list);
-
- (*G_OBJECT_CLASS (thunar_vfs_link_job_parent_class)->finalize) (object);
-}
-
-
-
-static void
-thunar_vfs_link_job_execute (ThunarVfsJob *job)
-{
- ThunarVfsLinkJob *link_job = THUNAR_VFS_LINK_JOB (job);
- ThunarVfsPath *target_path;
- gboolean overwrite;
- gdouble percent;
- GError *error = NULL;
- gchar target_absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
- gchar *display_name;
- gchar *message;
- guint completed = 0;
- guint total;
- GList *target_path_list = NULL;
- GList *sp;
- GList *tp;
-
- /* determine the total number of source files */
- total = g_list_length (link_job->source_path_list);
-
- /* process all files */
- for (sp = link_job->source_path_list, tp = link_job->target_path_list; sp != NULL && tp != NULL; sp = sp->next, tp = tp->next)
- {
- /* check if the job was cancelled */
- if (thunar_vfs_job_cancelled (job))
- break;
-
- /* update the progress message */
- display_name = g_filename_display_name (thunar_vfs_path_get_name (sp->data));
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (link_job), display_name);
- g_free (display_name);
-
-again:
- /* try to perform the symlink operation */
- if (thunar_vfs_xfer_link (sp->data, tp->data, &target_path, &error))
- {
- /* add the item to the target path list */
- target_path_list = g_list_prepend (target_path_list, target_path);
- }
- else if (error->domain == G_FILE_ERROR && error->code == G_FILE_ERROR_EXIST)
- {
- /* ask the user whether we should remove the target first */
- message = g_strdup_printf (_("%s.\n\nDo you want to overwrite it?"), error->message);
- overwrite = thunar_vfs_interactive_job_overwrite (THUNAR_VFS_INTERACTIVE_JOB (link_job), message);
- g_free (message);
-
- /* release the error */
- g_clear_error (&error);
-
- if (G_LIKELY (overwrite))
- {
- /* determine the absolute path to the target file */
- if (thunar_vfs_path_to_string (tp->data, target_absolute_path, sizeof (target_absolute_path), &error) < 0)
- {
-error_and_cancel:
- /* notify the user about the error */
- thunar_vfs_job_error (job, error);
- thunar_vfs_job_cancel (job);
- g_clear_error (&error);
- break;
- }
-
- /* try to unlink the target file */
- if (g_unlink (target_absolute_path) < 0 && errno != ENOENT)
- {
- error = g_error_new (G_FILE_ERROR, g_file_error_from_errno (errno),
- _("Failed to remove \"%s\": %s"), target_absolute_path,
- g_strerror (errno));
- goto error_and_cancel;
- }
-
- /* try again... */
- goto again;
- }
- }
- else
- {
- /* ask the user whether to skip this file (used for cancellation only) */
- message = g_strdup_printf (_("%s.\n\nDo you want to skip it?"), error->message);
- thunar_vfs_interactive_job_skip (THUNAR_VFS_INTERACTIVE_JOB (link_job), message);
- g_free (message);
-
- /* reset the error */
- g_clear_error (&error);
- }
-
- /* update the progress status */
- percent = (++completed * 100.0) / total;
- percent = CLAMP (percent, 0.0, 100.0);
- thunar_vfs_interactive_job_percent (THUNAR_VFS_INTERACTIVE_JOB (link_job), percent);
- }
-
- /* emit the "new-files" signal if we have any new files */
- if (G_LIKELY (target_path_list != NULL))
- {
- thunar_vfs_interactive_job_new_files (THUNAR_VFS_INTERACTIVE_JOB (link_job), target_path_list);
- thunar_vfs_path_list_free (target_path_list);
- }
-}
-
-
-
-/**
- * thunar_vfs_link_job_new:
- * @source_path_list : the list of #ThunarVfsPath<!---->s to the source files.
- * @target_path_list : the list of #ThunarVfsPath<!---->s to the target files.
- * @error : return location for errors or %NULL.
- *
- * Allocates a new #ThunarVfsLinkJob, that symlinks all files from @source_path_list
- * to the paths listed in @target_path_list.
- *
- * The caller is responsible to free the returned object using g_object_unref() when
- * no longer needed.
- *
- * Return value: the newly allocated #ThunarVfsLinkJob or %NULL on error.
- **/
-ThunarVfsJob*
-thunar_vfs_link_job_new (GList *source_path_list,
- GList *target_path_list,
- GError **error)
-{
- ThunarVfsLinkJob *link_job;
-
- g_return_val_if_fail (g_list_length (source_path_list) == g_list_length (target_path_list), NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- /* allocate the new job */
- link_job = g_object_new (THUNAR_VFS_TYPE_LINK_JOB, NULL);
- link_job->source_path_list = thunar_vfs_path_list_copy (source_path_list);
- link_job->target_path_list = thunar_vfs_path_list_copy (target_path_list);
-
- return THUNAR_VFS_JOB (link_job);
-}
-
-
-
-#define __THUNAR_VFS_LINK_JOB_C__
-#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-link-job.h b/thunar-vfs/thunar-vfs-link-job.h
deleted file mode 100644
index f7beea844ac46fec29637afc4948c69d70cdfc4c..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-link-job.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
-#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef __THUNAR_VFS_LINK_JOB_H__
-#define __THUNAR_VFS_LINK_JOB_H__
-
-#include <thunar-vfs/thunar-vfs-interactive-job.h>
-
-G_BEGIN_DECLS;
-
-typedef struct _ThunarVfsLinkJobClass ThunarVfsLinkJobClass;
-typedef struct _ThunarVfsLinkJob ThunarVfsLinkJob;
-
-#define THUNAR_VFS_TYPE_LINK_JOB (thunar_vfs_link_job_get_type ())
-#define THUNAR_VFS_LINK_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_LINK_JOB, ThunarVfsLinkJob))
-#define THUNAR_VFS_LINK_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_LINK_JOB, ThunarVfsLinkJobClass))
-#define THUNAR_VFS_IS_LINK_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_LINK_JOB))
-#define THUNAR_VFS_IS_LINK_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_LINK_JOB))
-#define THUNAR_VFS_LINK_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_LINK_JOB, ThunarVfsLinkJobClass))
-
-GType thunar_vfs_link_job_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
-
-ThunarVfsJob *thunar_vfs_link_job_new (GList *source_path_list,
- GList *target_path_list,
- GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_VFS_LINK_JOB_H__ */
diff --git a/thunar-vfs/thunar-vfs-listdir-job.c b/thunar-vfs/thunar-vfs-listdir-job.c
deleted file mode 100644
index bf07462a566d2307231e198bf4f5bd353aa03c44..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-listdir-job.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include <thunar-vfs/thunar-vfs-info.h>
-#include <thunar-vfs/thunar-vfs-listdir-job.h>
-#include <thunar-vfs/thunar-vfs-marshal.h>
-#include <thunar-vfs/thunar-vfs-private.h>
-#include <thunar-vfs/thunar-vfs-scandir.h>
-#include <thunar-vfs/thunar-vfs-alias.h>
-
-
-
-enum
-{
- INFOS_READY,
- LAST_SIGNAL,
-};
-
-
-
-typedef struct _ThunarVfsListdirJobTask ThunarVfsListdirJobTask;
-
-
-
-static void thunar_vfs_listdir_job_class_init (ThunarVfsJobClass *klass);
-static void thunar_vfs_listdir_job_finalize (GObject *object);
-static void thunar_vfs_listdir_job_execute (ThunarVfsJob *job);
-static void thunar_vfs_listdir_job_task (ThunarVfsListdirJobTask *task);
-
-
-struct _ThunarVfsListdirJobClass
-{
- ThunarVfsJobClass __parent__;
-};
-
-struct _ThunarVfsListdirJob
-{
- ThunarVfsJob __parent__;
- ThunarVfsPath *path;
-};
-
-struct _ThunarVfsListdirJobTask
-{
- GList *first;
- GList *last;
- guint floc;
- gchar fpath[THUNAR_VFS_PATH_MAXSTRLEN + 128];
-};
-
-
-
-static GObjectClass *thunar_vfs_listdir_job_parent_class;
-static guint listdir_signals[LAST_SIGNAL];
-
-
-
-GType
-thunar_vfs_listdir_job_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_JOB,
- "ThunarVfsListdirJob",
- sizeof (ThunarVfsListdirJobClass),
- thunar_vfs_listdir_job_class_init,
- sizeof (ThunarVfsListdirJob),
- NULL,
- 0);
- }
-
- return type;
-}
-
-
-
-static void
-thunar_vfs_listdir_job_class_init (ThunarVfsJobClass *klass)
-{
- GObjectClass *gobject_class;
-
- /* determine the parent class */
- thunar_vfs_listdir_job_parent_class = g_type_class_peek_parent (klass);
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = thunar_vfs_listdir_job_finalize;
-
- klass->execute = thunar_vfs_listdir_job_execute;
-
- /**
- * ThunarVfsListdirJob::infos-ready:
- * @job : a #ThunarVfsJob.
- * @infos : a list of #ThunarVfsInfo<!---->s.
- *
- * This signal is emitted whenever there's a new bunch of
- * #ThunarVfsInfo<!---->s ready. This signal is garantied
- * to be never emitted with an @infos parameter of %NULL.
- *
- * To allow some further optimizations on the handler-side,
- * the handler is allowed to take over ownership of the @infos
- * list, i.e. it can reuse the @infos list and just replace
- * the data elements with it's own objects based on the
- * #ThunarVfsInfo<!--->s contained within the @infos list (and
- * of course properly unreffing the previously contained infos).
- * If a handler takes over ownership of @infos it must return
- * %TRUE here, and no further handlers will be run. Else, if
- * the handler doesn't want to take over ownership of @infos,
- * it must return %FALSE, and other handlers will be run. Use
- * this feature with care, and only if you can be sure that
- * you are the only handler connected to this signal for a
- * given job!
- *
- * Return value: %TRUE if the handler took over ownership of
- * @infos, else %FALSE.
- **/
- listdir_signals[INFOS_READY] =
- g_signal_new (I_("infos-ready"),
- G_TYPE_FROM_CLASS (klass), G_SIGNAL_NO_HOOKS,
- 0, g_signal_accumulator_true_handled, NULL,
- _thunar_vfs_marshal_BOOLEAN__POINTER,
- G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
-}
-
-
-
-static void
-thunar_vfs_listdir_job_finalize (GObject *object)
-{
- ThunarVfsListdirJob *listdir_job = THUNAR_VFS_LISTDIR_JOB (object);
-
- /* free the folder path */
- if (G_LIKELY (listdir_job->path != NULL))
- thunar_vfs_path_unref (listdir_job->path);
-
- /* call the parents finalize method */
- (*G_OBJECT_CLASS (thunar_vfs_listdir_job_parent_class)->finalize) (object);
-}
-
-
-
-static gint
-pathcmp (gconstpointer a,
- gconstpointer b)
-{
- return -strcmp (thunar_vfs_path_get_name (a),
- thunar_vfs_path_get_name (b));
-}
-
-
-
-static void
-thunar_vfs_listdir_job_execute (ThunarVfsJob *job)
-{
- GThreadPool *pool;
- gboolean handled = FALSE;
- GError *error = NULL;
- GList *list = NULL;
- GList *lp;
- GList *hp;
- guint n;
-
- /* scan the given directory */
- list = thunar_vfs_scandir (THUNAR_VFS_LISTDIR_JOB (job)->path, &job->cancelled, THUNAR_VFS_SCANDIR_FOLLOW_LINKS, pathcmp, &error);
- if (G_LIKELY (list != NULL))
- {
- for (lp = hp = list, n = 0; lp != NULL; lp = lp->next, ++n)
- if ((n % 2) == 0)
- hp = hp->next;
-
- /* no need to parallelize for really small folders */
- if (G_UNLIKELY (n < 50))
- {
- /* initialize the task struct */
- ThunarVfsListdirJobTask task;
- task.first = list;
- task.last = NULL;
-
- /* put in the absolute path to the folder */
- task.floc = thunar_vfs_path_to_string (THUNAR_VFS_LISTDIR_JOB (job)->path, task.fpath, sizeof (task.fpath), &error);
- if (G_LIKELY (task.floc > 0))
- {
- /* append a path separator to the absolute folder path, so we can easily generate child paths */
- task.fpath[task.floc - 1] = G_DIR_SEPARATOR;
-
- /* run the task */
- thunar_vfs_listdir_job_task (&task);
-
- /* use the new first item as list head */
- list = task.first;
- }
- }
- else
- {
- /* allocate memory for 2 tasks */
- ThunarVfsListdirJobTask tasks[2];
-
- /* initialize the first task */
- tasks[0].first = list;
- tasks[0].last = NULL;
-
- /* put in the absolute path to the folder */
- tasks[0].floc = thunar_vfs_path_to_string (THUNAR_VFS_LISTDIR_JOB (job)->path, tasks[0].fpath, sizeof (tasks[0].fpath), &error);
- if (G_LIKELY (tasks[0].floc > 0))
- {
- /* allocate a thread pool for the first task */
- pool = g_thread_pool_new ((GFunc) thunar_vfs_listdir_job_task, NULL, 1, FALSE, NULL);
-
- /* append a path separator to the absolute folder path, so we can easily generate child paths */
- tasks[0].fpath[tasks[0].floc - 1] = G_DIR_SEPARATOR;
-
- /* terminate the list for the first task */
- hp->prev->next = NULL;
- hp->prev = NULL;
-
- /* launch the first task */
- g_thread_pool_push (pool, &tasks[0], NULL);
-
- /* initialize the second task */
- tasks[1].first = hp;
- tasks[1].last = NULL;
- tasks[1].floc = tasks[0].floc;
- memcpy (tasks[1].fpath, tasks[0].fpath, tasks[0].floc);
-
- /* run the second task */
- thunar_vfs_listdir_job_task (&tasks[1]);
-
- /* wait for the first task to finish */
- g_thread_pool_free (pool, FALSE, TRUE);
-
- /* concatenate the info lists */
- if (G_UNLIKELY (tasks[0].last == NULL))
- {
- list = tasks[1].first;
- }
- else
- {
- tasks[0].last->next = tasks[1].first;
- if (G_LIKELY (tasks[1].first != NULL))
- tasks[1].first->prev = tasks[0].last;
- }
- }
- }
-
- /* release the path list in case of an early error */
- if (G_UNLIKELY (error != NULL))
- {
- thunar_vfs_path_list_free (list);
- list = NULL;
- }
- }
-
- /* emit appropriate signals */
- if (G_UNLIKELY (error != NULL))
- {
- thunar_vfs_job_error (job, error);
- g_error_free (error);
- }
- else if (G_LIKELY (list != NULL))
- {
- /* emit the "infos-ready" signal with the given list */
- thunar_vfs_job_emit (job, listdir_signals[INFOS_READY], 0, list, &handled);
-
- /* check if one of the handlers took over ownership of the list, if
- * not, we still own it and we are responsible to release it.
- */
- if (G_UNLIKELY (!handled))
- thunar_vfs_info_list_free (list);
- }
-}
-
-
-
-static void
-thunar_vfs_listdir_job_task (ThunarVfsListdirJobTask *task)
-{
- ThunarVfsInfo *info;
- GList *sp;
- GList *tp;
-
- for (sp = tp = task->first; sp != NULL; sp = sp->next)
- {
- /* generate the absolute path to the file */
- g_strlcpy (task->fpath + task->floc, thunar_vfs_path_get_name (sp->data), sizeof (task->fpath) - task->floc);
-
- /* try to determine the file info */
- info = _thunar_vfs_info_new_internal (sp->data, task->fpath, NULL);
-
- /* release the reference on the path (the info holds the reference now) */
- thunar_vfs_path_unref (sp->data);
-
- /* replace the path with the info on the list */
- if (G_LIKELY (info != NULL))
- {
- task->last = tp;
- tp->data = info;
- tp = tp->next;
- }
- }
-
- /* release the not-filled list items (only non-NULL in case of an info error) */
- if (G_UNLIKELY (tp != NULL))
- {
- if (G_LIKELY (tp->prev != NULL))
- tp->prev->next = NULL;
- else
- task->first = NULL;
- g_list_free (tp);
- }
-}
-
-
-
-/**
- * thunar_vfs_job_new:
- * @folder_path : the #ThunarVfsPath of the directory whose contents to query.
- *
- * Allocates a new #ThunarVfsListdirJob object, which can be used to
- * query the contents of the directory @folder_path.
- *
- * You need to call thunar_vfs_job_launch() in order to start the
- * job. You may want to connect to ::finished, ::error-occurred and
- * ::infos-ready prior to launching the job.
- *
- * The caller is responsible to call g_object_unref() on the
- * returned object.
- *
- * Return value: the newly allocated #ThunarVfsJob, which performs the
- * directory listing.
- **/
-ThunarVfsJob*
-thunar_vfs_listdir_job_new (ThunarVfsPath *folder_path)
-{
- ThunarVfsListdirJob *listdir_job;
-
- listdir_job = g_object_new (THUNAR_VFS_TYPE_LISTDIR_JOB, NULL);
- listdir_job->path = thunar_vfs_path_ref (folder_path);
-
- return THUNAR_VFS_JOB (listdir_job);
-}
-
-
-
-#define __THUNAR_VFS_LISTDIR_JOB_C__
-#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-listdir-job.h b/thunar-vfs/thunar-vfs-listdir-job.h
deleted file mode 100644
index 220f3640e64f6b909a41bff548cd91facd3e01a0..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-listdir-job.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __THUNAR_VFS_LISTDIR_JOB_H__
-#define __THUNAR_VFS_LISTDIR_JOB_H__
-
-#include <thunar-vfs/thunar-vfs-job.h>
-#include <thunar-vfs/thunar-vfs-path.h>
-
-G_BEGIN_DECLS;
-
-typedef struct _ThunarVfsListdirJobClass ThunarVfsListdirJobClass;
-typedef struct _ThunarVfsListdirJob ThunarVfsListdirJob;
-
-#define THUNAR_VFS_TYPE_LISTDIR_JOB (thunar_vfs_listdir_job_get_type ())
-#define THUNAR_VFS_LISTDIR_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_LISTDIR_JOB, ThunarVfsListdirJob))
-#define THUNAR_VFS_LISTDIR_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_LISTDIR_JOB, ThunarVfsListdirJobClass))
-#define THUNAR_VFS_IS_LISTDIR_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_LISTDIR_JOB))
-#define THUNAR_VFS_IS_LISTDIR_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_LISTDIR_JOB))
-#define THUNAR_VFS_LISTDIR_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_LISTDIR_JOB, ThunarVfsListdirJobClass))
-
-GType thunar_vfs_listdir_job_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
-
-ThunarVfsJob *thunar_vfs_listdir_job_new (ThunarVfsPath *folder_path) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_VFS_LISTDIR_JOB_H__ */
diff --git a/thunar-vfs/thunar-vfs-mime-database-private.h b/thunar-vfs/thunar-vfs-mime-database-private.h
new file mode 100644
index 0000000000000000000000000000000000000000..ebb4619fcbfc07325db468eba9b9cbcf377cf36c
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-mime-database-private.h
@@ -0,0 +1,42 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_MIME_DATABASE_PRIVATE_H__
+#define __THUNAR_VFS_MIME_DATABASE_PRIVATE_H__
+
+#include <thunar-vfs/thunar-vfs-mime-database.h>
+
+G_BEGIN_DECLS;
+
+/* shared mime database and mime infos */
+extern ThunarVfsMimeDatabase *_thunar_vfs_mime_database G_GNUC_INTERNAL;
+extern ThunarVfsMimeInfo *_thunar_vfs_mime_inode_directory G_GNUC_INTERNAL;
+extern ThunarVfsMimeInfo *_thunar_vfs_mime_application_x_desktop G_GNUC_INTERNAL;
+extern ThunarVfsMimeInfo *_thunar_vfs_mime_application_x_executable G_GNUC_INTERNAL;
+extern ThunarVfsMimeInfo *_thunar_vfs_mime_application_x_shellscript G_GNUC_INTERNAL;
+extern ThunarVfsMimeInfo *_thunar_vfs_mime_application_octet_stream G_GNUC_INTERNAL;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_MIME_DATABASE_PRIVATE_H__ */
diff --git a/thunar-vfs/thunar-vfs-mime-database.c b/thunar-vfs/thunar-vfs-mime-database.c
index f68173d82debfa3d3593b9c2955cfbc8fbb34a2e..a8c1fafd8ec0d07785dbed6807491004e359d5a8 100644
--- a/thunar-vfs/thunar-vfs-mime-database.c
+++ b/thunar-vfs/thunar-vfs-mime-database.c
@@ -55,13 +55,12 @@
#include <unistd.h>
#endif
-#include <exo/exo.h>
-
#include <thunar-vfs/thunar-vfs-mime-cache.h>
-#include <thunar-vfs/thunar-vfs-mime-database.h>
+#include <thunar-vfs/thunar-vfs-mime-database-private.h>
#include <thunar-vfs/thunar-vfs-mime-legacy.h>
#include <thunar-vfs/thunar-vfs-mime-sniffer.h>
-#include <thunar-vfs/thunar-vfs-monitor.h>
+#include <thunar-vfs/thunar-vfs-monitor-private.h>
+#include <thunar-vfs/thunar-vfs-path-private.h>
#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
@@ -136,9 +135,7 @@ struct _ThunarVfsMimeDatabase
{
GObject __parent__;
- GMutex *lock;
-
- ThunarVfsMonitor *monitor;
+ GMutex *lock;
/* GtkIconTheme changed hook id */
gulong changed_hook_id;
@@ -229,9 +226,6 @@ thunar_vfs_mime_database_init (ThunarVfsMimeDatabase *database)
/* create the lock for this object */
database->lock = g_mutex_new ();
- /* acquire a reference on the file alteration monitor */
- database->monitor = thunar_vfs_monitor_get_default ();
-
/* allocate the hash table for the mime infos */
database->infos = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) thunar_vfs_mime_info_unref);
@@ -286,9 +280,6 @@ thunar_vfs_mime_database_finalize (GObject *object)
/* free all mime infos */
g_hash_table_destroy (database->infos);
- /* release the reference on the file alteration monitor */
- g_object_unref (G_OBJECT (database->monitor));
-
/* release the mutex for this object */
g_mutex_free (database->lock);
@@ -575,7 +566,7 @@ thunar_vfs_mime_database_initialize_providers (ThunarVfsMimeDatabase *database)
directory = g_build_filename (basedirs[n], "mime", NULL);
/* allocate the provider data for the directory */
- data = g_new (ThunarVfsMimeProviderData, 1);
+ data = _thunar_vfs_slice_new (ThunarVfsMimeProviderData);
data->handle = NULL;
data->path = thunar_vfs_path_new (directory, NULL);
@@ -637,7 +628,7 @@ thunar_vfs_mime_database_shutdown_providers (ThunarVfsMimeDatabase *database)
if (G_LIKELY (THUNAR_VFS_MIME_PROVIDER_DATA (lp->data)->provider != NULL))
g_object_unref (THUNAR_VFS_MIME_PROVIDER_DATA (lp->data)->provider);
thunar_vfs_path_unref (THUNAR_VFS_MIME_PROVIDER_DATA (lp->data)->path);
- g_free (THUNAR_VFS_MIME_PROVIDER_DATA (lp->data));
+ _thunar_vfs_slice_free (ThunarVfsMimeProviderData, lp->data);
}
g_list_free (database->providers);
@@ -674,7 +665,7 @@ thunar_vfs_mime_database_initialize_stores (ThunarVfsMimeDatabase *database)
(GDestroyNotify) thunar_vfs_mime_info_unref,
(GDestroyNotify) g_strfreev);
store->defaults_list_path = thunar_vfs_path_new (path, NULL);
- store->defaults_list_handle = thunar_vfs_monitor_add_file (database->monitor, store->defaults_list_path,
+ store->defaults_list_handle = thunar_vfs_monitor_add_file (_thunar_vfs_monitor, store->defaults_list_path,
thunar_vfs_mime_database_store_changed, database);
thunar_vfs_mime_database_store_parse_file (database, store->defaults_list_path, store->defaults_list);
g_free (path);
@@ -686,7 +677,7 @@ thunar_vfs_mime_database_initialize_stores (ThunarVfsMimeDatabase *database)
(GDestroyNotify) thunar_vfs_mime_info_unref,
(GDestroyNotify) g_strfreev);
store->mimeinfo_cache_path = thunar_vfs_path_new (path, NULL);
- store->mimeinfo_cache_handle = thunar_vfs_monitor_add_file (database->monitor, store->mimeinfo_cache_path,
+ store->mimeinfo_cache_handle = thunar_vfs_monitor_add_file (_thunar_vfs_monitor, store->mimeinfo_cache_path,
thunar_vfs_mime_database_store_changed, database);
thunar_vfs_mime_database_store_parse_file (database, store->mimeinfo_cache_path, store->mimeinfo_cache);
g_free (path);
@@ -717,12 +708,12 @@ thunar_vfs_mime_database_shutdown_stores (ThunarVfsMimeDatabase *database)
for (n = 0, store = database->stores; n < database->n_stores; ++n, ++store)
{
/* release the defaults.list part */
- thunar_vfs_monitor_remove (database->monitor, store->defaults_list_handle);
+ thunar_vfs_monitor_remove (_thunar_vfs_monitor, store->defaults_list_handle);
thunar_vfs_path_unref (store->defaults_list_path);
g_hash_table_destroy (store->defaults_list);
/* release the mimeinfo.cache part */
- thunar_vfs_monitor_remove (database->monitor, store->mimeinfo_cache_handle);
+ thunar_vfs_monitor_remove (_thunar_vfs_monitor, store->mimeinfo_cache_handle);
thunar_vfs_path_unref (store->mimeinfo_cache_path);
g_hash_table_destroy (store->mimeinfo_cache);
}
@@ -929,19 +920,7 @@ thunar_vfs_mime_database_cleanup_timer_destroy (gpointer user_data)
ThunarVfsMimeDatabase*
thunar_vfs_mime_database_get_default (void)
{
- static ThunarVfsMimeDatabase *database = NULL;
-
- if (G_UNLIKELY (database == NULL))
- {
- database = g_object_new (THUNAR_VFS_TYPE_MIME_DATABASE, NULL);
- g_object_add_weak_pointer (G_OBJECT (database), (gpointer) &database);
- }
- else
- {
- g_object_ref (G_OBJECT (database));
- }
-
- return database;
+ return g_object_ref (G_OBJECT (_thunar_vfs_mime_database));
}
@@ -1586,7 +1565,7 @@ thunar_vfs_mime_database_set_default_application (ThunarVfsMimeDatabase *data
fclose (fp);
/* disable the monitor handle for the defaults.list, so we don't unneccessary reload it */
- thunar_vfs_monitor_remove (database->monitor, store->defaults_list_handle);
+ thunar_vfs_monitor_remove (_thunar_vfs_monitor, store->defaults_list_handle);
/* try to atomically rename the file */
if (G_UNLIKELY (g_rename (path, absolute_path) < 0))
@@ -1600,7 +1579,7 @@ thunar_vfs_mime_database_set_default_application (ThunarVfsMimeDatabase *data
}
/* re-enable the monitor handle for the defaults.list */
- store->defaults_list_handle = thunar_vfs_monitor_add_file (database->monitor, store->defaults_list_path,
+ store->defaults_list_handle = thunar_vfs_monitor_add_file (_thunar_vfs_monitor, store->defaults_list_path,
thunar_vfs_mime_database_store_changed, database);
}
else
@@ -1796,5 +1775,65 @@ thunar_vfs_mime_database_remove_application (ThunarVfsMimeDatabase *database,
+/**
+ * _thunar_vfs_mime_database:
+ *
+ * The shared reference to the global mime database. Only valid between
+ * calls to thunar_vfs_init() and thunar_vfs_shutdown().
+ **/
+ThunarVfsMimeDatabase *_thunar_vfs_mime_database = NULL;
+
+
+
+/**
+ * _thunar_vfs_mime_inode_directory:
+ *
+ * The shared #ThunarVfsMimeInfo instance for "inode/directory". Only valid
+ * between calls to thunar_vfs_init() and thunar_vfs_shutdown().
+ **/
+ThunarVfsMimeInfo *_thunar_vfs_mime_inode_directory = NULL;
+
+
+
+/**
+ * _thunar_vfs_mime_application_x_desktop:
+ *
+ * The shared #ThunarVfsMimeInfo instance for "application/x-desktop". Only valid
+ * between calls to thunar_vfs_init() and thunar_vfs_shutdown().
+ **/
+ThunarVfsMimeInfo *_thunar_vfs_mime_application_x_desktop = NULL;
+
+
+
+/**
+ * _thunar_vfs_mime_application_x_executable:
+ *
+ * The shared #ThunarVfsMimeInfo instance for "application/x-executable". Only valid
+ * between calls to thunar_vfs_init() and thunar_vfs_shutdown().
+ **/
+ThunarVfsMimeInfo *_thunar_vfs_mime_application_x_executable = NULL;
+
+
+
+/**
+ * _thunar_vfs_mime_application_x_shellscript:
+ *
+ * The shared #ThunarVfsMimeInfo instance for "application/x-shellscript". Only valid
+ * between calls to thunar_vfs_init() and thunar_vfs_shutdown().
+ **/
+ThunarVfsMimeInfo *_thunar_vfs_mime_application_x_shellscript = NULL;
+
+
+
+/**
+ * _thunar_vfs_mime_application_octet_stream:
+ *
+ * The shared #ThunarVfsMimeInfo instance for "application/octet-stream". Only valid
+ * between calls to thunar_vfs_init() and thunar_vfs_shutdown().
+ **/
+ThunarVfsMimeInfo *_thunar_vfs_mime_application_octet_stream = NULL;
+
+
+
#define __THUNAR_VFS_MIME_DATABASE_C__
#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-mime-handler.c b/thunar-vfs/thunar-vfs-mime-handler.c
index b94d33b7e3498df36ab13de2cd7a25eb767993e7..b4596fc9119cb5daacd4cecb248e23993f0b414a 100644
--- a/thunar-vfs/thunar-vfs-mime-handler.c
+++ b/thunar-vfs/thunar-vfs-mime-handler.c
@@ -33,7 +33,7 @@
#include <thunar-vfs/thunar-vfs-exec.h>
#include <thunar-vfs/thunar-vfs-mime-handler-private.h>
#include <thunar-vfs/thunar-vfs-mime-handler.h>
-#include <thunar-vfs/thunar-vfs-path.h>
+#include <thunar-vfs/thunar-vfs-path-private.h>
#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
@@ -61,6 +61,11 @@ static void thunar_vfs_mime_handler_set_property (GObject
guint prop_id,
const GValue *value,
GParamSpec *pspec);
+static gboolean thunar_vfs_mime_handler_execute (const ThunarVfsMimeHandler *mime_handler,
+ GdkScreen *screen,
+ GList *path_list,
+ gchar **envp,
+ GError **error);
static gboolean thunar_vfs_mime_handler_get_argv (const ThunarVfsMimeHandler *mime_handler,
GList *path_list,
gint *argc,
@@ -258,6 +263,40 @@ thunar_vfs_mime_handler_set_property (GObject *object,
+static gboolean
+thunar_vfs_mime_handler_execute (const ThunarVfsMimeHandler *mime_handler,
+ GdkScreen *screen,
+ GList *path_list,
+ gchar **envp,
+ GError **error)
+{
+ ThunarVfsPath *parent;
+ gboolean result;
+ gchar *working_directory;
+ gchar **argv;
+ gint argc;
+
+ /* parse the command line */
+ if (!thunar_vfs_mime_handler_get_argv (mime_handler, path_list, &argc, &argv, error))
+ return FALSE;
+
+ /* use the first paths base directory as working directory for the application */
+ parent = (path_list != NULL) ? thunar_vfs_path_get_parent (path_list->data) : NULL;
+ working_directory = (parent != NULL) ? _thunar_vfs_path_translate_dup_string (parent, THUNAR_VFS_PATH_SCHEME_FILE, NULL) : NULL;
+
+ /* try to spawn the application */
+ result = thunar_vfs_exec_on_screen (screen, working_directory, argv, envp, G_SPAWN_SEARCH_PATH,
+ mime_handler->flags & THUNAR_VFS_MIME_HANDLER_SUPPORTS_STARTUP_NOTIFY, error);
+
+ /* cleanup */
+ g_free (working_directory);
+ g_strfreev (argv);
+
+ return result;
+}
+
+
+
static gboolean
thunar_vfs_mime_handler_get_argv (const ThunarVfsMimeHandler *mime_handler,
GList *path_list,
@@ -447,13 +486,9 @@ thunar_vfs_mime_handler_exec_with_env (const ThunarVfsMimeHandler *mime_handler,
gchar **envp,
GError **error)
{
- ThunarVfsPath *parent;
- gboolean result = TRUE;
- GList list;
- GList *lp;
- gchar *working_directory;
- gchar **argv;
- gint argc;
+ gboolean succeed = TRUE;
+ GList list;
+ GList *lp;
g_return_val_if_fail (THUNAR_VFS_IS_MIME_HANDLER (mime_handler), FALSE);
g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
@@ -464,56 +499,29 @@ thunar_vfs_mime_handler_exec_with_env (const ThunarVfsMimeHandler *mime_handler,
screen = gdk_screen_get_default ();
/* check whether the application can open multiple documents at once */
- if (G_LIKELY ((mime_handler->flags & THUNAR_VFS_MIME_HANDLER_SUPPORTS_MULTI) == 0))
+ if (G_LIKELY ((mime_handler->flags & THUNAR_VFS_MIME_HANDLER_SUPPORTS_MULTI) == 0 && path_list != NULL))
{
- for (lp = path_list; lp != NULL; lp = lp->next)
+ /* fake an empty list */
+ list.next = NULL;
+ list.prev = NULL;
+
+ /* spawn a new instance for each path item */
+ for (lp = path_list; lp != NULL && succeed; lp = lp->next)
{
- /* use a short list with only one entry */
+ /* "insert" into faked list */
list.data = lp->data;
- list.next = NULL;
- list.prev = NULL;
-
- /* figure out the argument vector to run the application */
- if (!thunar_vfs_mime_handler_get_argv (mime_handler, &list, &argc, &argv, error))
- return FALSE;
- /* use the paths base directory as working directory for the application */
- parent = thunar_vfs_path_get_parent (list.data);
- working_directory = (parent != NULL) ? thunar_vfs_path_dup_string (parent) : NULL;
-
- /* try to spawn the application */
- result = thunar_vfs_exec_on_screen (screen, working_directory, argv, envp, G_SPAWN_SEARCH_PATH,
- mime_handler->flags & THUNAR_VFS_MIME_HANDLER_SUPPORTS_STARTUP_NOTIFY, error);
-
- /* cleanup */
- g_free (working_directory);
- g_strfreev (argv);
-
- /* check if we succeed */
- if (G_UNLIKELY (!result))
- break;
+ /* spawn the instance */
+ succeed = thunar_vfs_mime_handler_execute (mime_handler, screen, &list, envp, error);
}
}
else
{
- /* we can open all documents at once */
- if (!thunar_vfs_mime_handler_get_argv (mime_handler, path_list, &argc, &argv, error))
- return FALSE;
-
- /* use the first paths base directory as working directory for the application */
- parent = (path_list != NULL) ? thunar_vfs_path_get_parent (path_list->data) : NULL;
- working_directory = (parent != NULL) ? thunar_vfs_path_dup_string (parent) : NULL;
-
- /* try to spawn the application */
- result = thunar_vfs_exec_on_screen (screen, working_directory, argv, envp, G_SPAWN_SEARCH_PATH,
- mime_handler->flags & THUNAR_VFS_MIME_HANDLER_SUPPORTS_STARTUP_NOTIFY, error);
-
- /* cleanup */
- g_free (working_directory);
- g_strfreev (argv);
+ /* spawn a single instance for all path items */
+ succeed = thunar_vfs_mime_handler_execute (mime_handler, screen, path_list, envp, error);
}
- return result;
+ return succeed;
}
diff --git a/thunar-vfs/thunar-vfs-mime-info.c b/thunar-vfs/thunar-vfs-mime-info.c
index 094f11a12af95b25f7e5d52aeeb4ea849ae192df..12993c2e83386ae30749c6c844682a36269d3ab9 100644
--- a/thunar-vfs/thunar-vfs-mime-info.c
+++ b/thunar-vfs/thunar-vfs-mime-info.c
@@ -35,6 +35,7 @@
#include <thunar-vfs/thunar-vfs-mime-info.h>
#include <thunar-vfs/thunar-vfs-mime-parser.h>
+#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
@@ -137,7 +138,7 @@ thunar_vfs_mime_info_new (const gchar *name,
len = strlen (name);
/* allocate the new object */
- info = g_malloc (sizeof (*info) + len + 1);
+ info = _thunar_vfs_slice_alloc (sizeof (*info) + len + 1);
info->ref_count = 1;
info->comment = NULL;
info->icon_name = NULL;
@@ -182,8 +183,8 @@ thunar_vfs_mime_info_unref (ThunarVfsMimeInfo *info)
g_free (info->icon_name);
}
- /* free the info struct */
- g_free (info);
+ /* free the info struct (need to determine the block size for the slice allocator) */
+ _thunar_vfs_slice_free1 (sizeof (*info) + strlen (((const gchar *) info) + sizeof (*info)) + 1, info);
}
}
@@ -432,6 +433,22 @@ thunar_vfs_mime_info_lookup_icon_name (ThunarVfsMimeInfo *info,
+/**
+ * thunar_vfs_mime_info_list_free:
+ * @info_list : a #GList of #ThunarVfsMimeInfo<!---->s
+ *
+ * Frees the list and all #ThunarVfsMimeInfo<!---->s
+ * contained within the list.
+ **/
+void
+thunar_vfs_mime_info_list_free (GList *info_list)
+{
+ g_list_foreach (info_list, (GFunc) thunar_vfs_mime_info_unref, NULL);
+ g_list_free (info_list);
+}
+
+
+
/**
* _thunar_vfs_mime_info_invalidate_icon_name:
* @info : a #ThunarVfsMimeInfo.
diff --git a/thunar-vfs/thunar-vfs-mime-info.h b/thunar-vfs/thunar-vfs-mime-info.h
index fc1d847693fb37a1499ea29b3ec491802da17567..45290aaf5afc746e51fe35f799119a15e081b890 100644
--- a/thunar-vfs/thunar-vfs-mime-info.h
+++ b/thunar-vfs/thunar-vfs-mime-info.h
@@ -58,7 +58,7 @@ gboolean thunar_vfs_mime_info_equal (gconstpo
const gchar *thunar_vfs_mime_info_lookup_icon_name (ThunarVfsMimeInfo *info,
GtkIconTheme *icon_theme);
-G_INLINE_FUNC void thunar_vfs_mime_info_list_free (GList *info_list);
+void thunar_vfs_mime_info_list_free (GList *info_list);
#if defined(THUNAR_VFS_COMPILATION)
@@ -98,20 +98,6 @@ thunar_vfs_mime_info_get_name (const ThunarVfsMimeInfo *info)
{
return ((const gchar *) info) + sizeof (*info);
}
-
-/**
- * thunar_vfs_mime_info_list_free:
- * @info_list : a #GList of #ThunarVfsMimeInfo<!---->s
- *
- * Frees the list and all #ThunarVfsMimeInfo<!---->s
- * contained within the list.
- **/
-G_INLINE_FUNC void
-thunar_vfs_mime_info_list_free (GList *info_list)
-{
- g_list_foreach (info_list, (GFunc) thunar_vfs_mime_info_unref, NULL);
- g_list_free (info_list);
-}
#endif /* G_CAN_INLINE || __THUNAR_VFS_MIME_INFO_C__ */
diff --git a/thunar-vfs/thunar-vfs-mkdir-job.c b/thunar-vfs/thunar-vfs-mkdir-job.c
deleted file mode 100644
index 6774b16ab897476cdfb008bdc0602d03f8f960b8..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-mkdir-job.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <thunar-vfs/thunar-vfs-mkdir-job.h>
-#include <thunar-vfs/thunar-vfs-private.h>
-#include <thunar-vfs/thunar-vfs-alias.h>
-
-#if GLIB_CHECK_VERSION(2,6,0)
-#include <glib/gstdio.h>
-#else
-#define g_mkdir(path, mode) (mkdir ((path), (mode)))
-#define g_unmkdir(path) (unmkdir ((path)))
-#endif
-
-
-
-static void thunar_vfs_mkdir_job_class_init (ThunarVfsMkdirJobClass *klass);
-static void thunar_vfs_mkdir_job_finalize (GObject *object);
-static void thunar_vfs_mkdir_job_execute (ThunarVfsJob *job);
-
-
-
-struct _ThunarVfsMkdirJobClass
-{
- ThunarVfsInteractiveJobClass __parent__;
-};
-
-struct _ThunarVfsMkdirJob
-{
- ThunarVfsInteractiveJob __parent__;
- GList *path_list;
-};
-
-
-
-static GObjectClass *thunar_vfs_mkdir_job_parent_class;
-
-
-
-GType
-thunar_vfs_mkdir_job_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_INTERACTIVE_JOB,
- "ThunarVfsMkdirJob",
- sizeof (ThunarVfsMkdirJobClass),
- thunar_vfs_mkdir_job_class_init,
- sizeof (ThunarVfsMkdirJob),
- NULL,
- 0);
- }
-
- return type;
-}
-
-
-
-static void
-thunar_vfs_mkdir_job_class_init (ThunarVfsMkdirJobClass *klass)
-{
- ThunarVfsJobClass *thunarvfs_job_class;
- GObjectClass *gobject_class;
-
- /* determine the parent class */
- thunar_vfs_mkdir_job_parent_class = g_type_class_peek_parent (klass);
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = thunar_vfs_mkdir_job_finalize;
-
- thunarvfs_job_class = THUNAR_VFS_JOB_CLASS (klass);
- thunarvfs_job_class->execute = thunar_vfs_mkdir_job_execute;
-}
-
-
-
-static void
-thunar_vfs_mkdir_job_finalize (GObject *object)
-{
- ThunarVfsMkdirJob *mkdir_job = THUNAR_VFS_MKDIR_JOB (object);
-
- /* release the path list */
- thunar_vfs_path_list_free (mkdir_job->path_list);
-
- (*G_OBJECT_CLASS (thunar_vfs_mkdir_job_parent_class)->finalize) (object);
-}
-
-
-
-static void
-thunar_vfs_mkdir_job_execute (ThunarVfsJob *job)
-{
- ThunarVfsMkdirJob *mkdir_job = THUNAR_VFS_MKDIR_JOB (job);
- gdouble percent;
- GError *error;
- gchar *absolute_path;
- gchar *display_name;
- guint completed = 0;
- guint total;
- GList *directories = NULL;
- GList *lp;
-
- /* determine the total number of directories to create */
- total = g_list_length (mkdir_job->path_list);
-
- /* process all directories */
- for (lp = mkdir_job->path_list; lp != NULL; lp = lp->next)
- {
- /* check if the job was cancelled */
- if (thunar_vfs_job_cancelled (job))
- break;
-
- /* update the progress message */
- display_name = g_filename_display_name (thunar_vfs_path_get_name (lp->data));
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (mkdir_job), display_name);
- g_free (display_name);
-
- /* determine the absolute path */
- absolute_path = thunar_vfs_path_dup_string (lp->data);
-
- /* try to create the target directory */
- if (g_mkdir (absolute_path, 0755) < 0)
- {
- /* generate an error describing the problem */
- display_name = g_filename_display_name (absolute_path);
- error = g_error_new (G_FILE_ERROR, g_file_error_from_errno (errno),
- _("Failed to create directory \"%s\": %s"),
- display_name, g_strerror (errno));
- g_free (display_name);
-
- /* notify theuser about the problem and cancel the job */
- thunar_vfs_job_error (job, error);
- thunar_vfs_job_cancel (job);
- g_error_free (error);
- }
- else
- {
- /* feed a "created" event for the new directory */
- thunar_vfs_monitor_feed (THUNAR_VFS_INTERACTIVE_JOB (mkdir_job)->monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, lp->data);
-
- /* add the path to the list of successfully created directories */
- directories = g_list_prepend (directories, lp->data);
- }
-
- /* update the progress status */
- percent = (++completed * 100.0) / total;
- percent = CLAMP (percent, 0.0, 100.0);
- thunar_vfs_interactive_job_percent (THUNAR_VFS_INTERACTIVE_JOB (mkdir_job), percent);
-
- /* release the absolute path */
- g_free (absolute_path);
- }
-
- /* emit the "new-files" signal if we have created any directories */
- if (G_LIKELY (directories != NULL))
- {
- thunar_vfs_interactive_job_new_files (THUNAR_VFS_INTERACTIVE_JOB (mkdir_job), directories);
- g_list_free (directories);
- }
-}
-
-
-
-/**
- * thunar_vfs_mkdir_job_new:
- * @path_list : the list of #ThunarVfsPath<!---->s to the directories that should be created.
- * @error : return location for errors or %NULL.
- *
- * Allocates a new #ThunarVfsMkdirJob, that creates directories for all #ThunarVfsPath<!---->s
- * listed in @path_list.
- *
- * The caller is responsible to free the returned object using g_object_unref() when
- * no longer needed.
- *
- * Return value: the newly allocated #ThunarVfsMkdirJob or %NULL on error.
- **/
-ThunarVfsJob*
-thunar_vfs_mkdir_job_new (GList *path_list,
- GError **error)
-{
- ThunarVfsMkdirJob *mkdir_job;
-
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- /* allocate the new job */
- mkdir_job = g_object_new (THUNAR_VFS_TYPE_MKDIR_JOB, NULL);
- mkdir_job->path_list = thunar_vfs_path_list_copy (path_list);
-
- return THUNAR_VFS_JOB (mkdir_job);
-}
-
-
-
-#define __THUNAR_VFS_MKDIR_JOB_C__
-#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-mkdir-job.h b/thunar-vfs/thunar-vfs-mkdir-job.h
deleted file mode 100644
index ba82aad76441420093789de802676b6c1ca17c6f..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-mkdir-job.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
-#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef __THUNAR_VFS_MKDIR_MKDIR_H__
-#define __THUNAR_VFS_MKDIR_MKDIR_H__
-
-#include <thunar-vfs/thunar-vfs-interactive-job.h>
-
-G_BEGIN_DECLS;
-
-typedef struct _ThunarVfsMkdirJobClass ThunarVfsMkdirJobClass;
-typedef struct _ThunarVfsMkdirJob ThunarVfsMkdirJob;
-
-#define THUNAR_VFS_TYPE_MKDIR_JOB (thunar_vfs_mkdir_job_get_type ())
-#define THUNAR_VFS_MKDIR_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_MKDIR_JOB, ThunarVfsMkdirJob))
-#define THUNAR_VFS_MKDIR_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_MKDIR_JOB, ThunarVfsMkdirJobClass))
-#define THUNAR_VFS_IS_MKDIR_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_MKDIR_JOB))
-#define THUNAR_VFS_IS_MKDIR_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_MKDIR_JOB))
-#define THUNAR_VFS_MKDIR_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_MKDIR_JOB, ThunarVfsMkdirJobClass))
-
-GType thunar_vfs_mkdir_job_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
-
-ThunarVfsJob *thunar_vfs_mkdir_job_new (GList *path_list,
- GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_VFS_MKDIR_JOB_H__ */
diff --git a/thunar-vfs/thunar-vfs-monitor-private.h b/thunar-vfs/thunar-vfs-monitor-private.h
new file mode 100644
index 0000000000000000000000000000000000000000..86fa7c11ce5b77b599c313f3bef7e7463748d2a2
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-monitor-private.h
@@ -0,0 +1,37 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_MONITOR_PRIVATE_H__
+#define __THUNAR_VFS_MONITOR_PRIVATE_H__
+
+#include <thunar-vfs/thunar-vfs-monitor.h>
+
+G_BEGIN_DECLS;
+
+/* shared monitor instance */
+extern ThunarVfsMonitor *_thunar_vfs_monitor G_GNUC_INTERNAL;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_MONITOR_PRIVATE_H__ */
diff --git a/thunar-vfs/thunar-vfs-monitor.c b/thunar-vfs/thunar-vfs-monitor.c
index 7d7cb02d0046b615685214e813f3240518a8bd05..9302d8ee00d5acb63c9544e2cf66744832183a8d 100644
--- a/thunar-vfs/thunar-vfs-monitor.c
+++ b/thunar-vfs/thunar-vfs-monitor.c
@@ -32,14 +32,15 @@
#include <string.h>
#endif
-#include <thunar-vfs/thunar-vfs-monitor.h>
+#include <thunar-vfs/thunar-vfs-monitor-private.h>
+#include <thunar-vfs/thunar-vfs-path-private.h>
#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
/* minimum timer interval (in ms) */
-#define THUNAR_VFS_MONITOR_TIMER_INTERVAL (250)
+#define THUNAR_VFS_MONITOR_TIMER_INTERVAL (200)
/* tagging for notifications, so we can make sure that
* (slow) FAM events don't override properly feeded events.
@@ -80,7 +81,6 @@ struct _ThunarVfsMonitor
{
GObject __parent__;
- GMemChunk *handle_chunk;
GList *handles;
gint notifications_timer_id;
@@ -195,9 +195,6 @@ thunar_vfs_monitor_init (ThunarVfsMonitor *monitor)
monitor->fc_watch_id = -1;
}
#endif
-
- /* allocate the memory chunk for the handles */
- monitor->handle_chunk = g_mem_chunk_create (ThunarVfsMonitorHandle, 64, G_ALLOC_AND_FREE);
}
@@ -228,12 +225,13 @@ thunar_vfs_monitor_finalize (GObject *object)
/* drop all handles */
for (lp = monitor->handles; lp != NULL; lp = lp->next)
- thunar_vfs_path_unref (((ThunarVfsMonitorHandle *) lp->data)->path);
+ {
+ /* release the path and the handle memory */
+ thunar_vfs_path_unref (((ThunarVfsMonitorHandle *) lp->data)->path);
+ _thunar_vfs_slice_free (ThunarVfsMonitorHandle, lp->data);
+ }
g_list_free (monitor->handles);
- /* release the memory chunk */
- g_mem_chunk_destroy (monitor->handle_chunk);
-
/* release the monitor lock */
g_mutex_free (monitor->lock);
g_cond_free (monitor->cond);
@@ -461,19 +459,7 @@ error:
ThunarVfsMonitor*
thunar_vfs_monitor_get_default (void)
{
- static ThunarVfsMonitor *monitor = NULL;
-
- if (G_UNLIKELY (monitor == NULL))
- {
- monitor = g_object_new (THUNAR_VFS_TYPE_MONITOR, NULL);
- g_object_add_weak_pointer (G_OBJECT (monitor), (gpointer) &monitor);
- }
- else
- {
- g_object_ref (G_OBJECT (monitor));
- }
-
- return monitor;
+ return g_object_ref (G_OBJECT (_thunar_vfs_monitor));
}
@@ -513,7 +499,7 @@ thunar_vfs_monitor_add_directory (ThunarVfsMonitor *monitor,
g_mutex_lock (monitor->lock);
/* allocate a new handle */
- handle = g_chunk_new (ThunarVfsMonitorHandle, monitor->handle_chunk);
+ handle = _thunar_vfs_slice_new (ThunarVfsMonitorHandle);
handle->path = thunar_vfs_path_ref (path);
handle->callback = callback;
handle->user_data = user_data;
@@ -521,7 +507,7 @@ thunar_vfs_monitor_add_directory (ThunarVfsMonitor *monitor,
handle->fr.reqnum = ++monitor->current_reqnum;
#ifdef HAVE_LIBFAM
- if (G_LIKELY (monitor->fc_watch_id >= 0))
+ if (G_LIKELY (monitor->fc_watch_id >= 0 && _thunar_vfs_path_is_local (path)))
{
/* schedule the watch on the FAM daemon */
absolute_path = thunar_vfs_path_dup_string (path);
@@ -577,7 +563,7 @@ thunar_vfs_monitor_add_file (ThunarVfsMonitor *monitor,
g_mutex_lock (monitor->lock);
/* allocate a new handle */
- handle = g_chunk_new (ThunarVfsMonitorHandle, monitor->handle_chunk);
+ handle = _thunar_vfs_slice_new (ThunarVfsMonitorHandle);
handle->path = thunar_vfs_path_ref (path);
handle->callback = callback;
handle->user_data = user_data;
@@ -585,7 +571,7 @@ thunar_vfs_monitor_add_file (ThunarVfsMonitor *monitor,
handle->fr.reqnum = ++monitor->current_reqnum;
#ifdef HAVE_LIBFAM
- if (G_LIKELY (monitor->fc_watch_id >= 0))
+ if (G_LIKELY (monitor->fc_watch_id >= 0 && _thunar_vfs_path_is_local (path)))
{
/* schedule the watch on the FAM daemon */
absolute_path = thunar_vfs_path_dup_string (path);
@@ -625,7 +611,7 @@ thunar_vfs_monitor_remove (ThunarVfsMonitor *monitor,
#ifdef HAVE_LIBFAM
/* drop the FAM request from the daemon */
- if (G_LIKELY (monitor->fc_watch_id >= 0))
+ if (G_LIKELY (monitor->fc_watch_id >= 0 && _thunar_vfs_path_is_local (handle->path)))
{
if (FAMCancelMonitor (&monitor->fc, &handle->fr) < 0)
thunar_vfs_monitor_fam_cancel (monitor);
@@ -635,9 +621,11 @@ thunar_vfs_monitor_remove (ThunarVfsMonitor *monitor,
/* unlink the handle */
monitor->handles = g_list_remove (monitor->handles, handle);
- /* free the handle */
+ /* release the path */
thunar_vfs_path_unref (handle->path);
- g_mem_chunk_free (monitor->handle_chunk, handle);
+
+ /* release the handle */
+ _thunar_vfs_slice_free (ThunarVfsMonitorHandle, handle);
/* release the monitor lock */
g_mutex_unlock (monitor->lock);
@@ -723,5 +711,17 @@ thunar_vfs_monitor_wait (ThunarVfsMonitor *monitor)
+/**
+ * _thunar_vfs_monitor:
+ *
+ * The shared #ThunarVfsMonitor instance, which is used by all modules that
+ * need to watch files for changes or manually need to feed changes into the
+ * monitor. Only valid between class to thunar_vfs_init() and
+ * thunar_vfs_shutdown().
+ **/
+ThunarVfsMonitor *_thunar_vfs_monitor = NULL;
+
+
+
#define __THUNAR_VFS_MONITOR_C__
#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-os-bsd.c b/thunar-vfs/thunar-vfs-os-bsd.c
new file mode 100644
index 0000000000000000000000000000000000000000..1c57fcc46b98dd2c1781e8bfaac84e224eb4159f
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-os-bsd.c
@@ -0,0 +1,289 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-os.h>
+#include <thunar-vfs/thunar-vfs-private.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+
+
+/**
+ * _thunar_vfs_os_is_dir_empty:
+ * @absolute_path : an absolute path to a folder.
+ *
+ * Returns %TRUE if the directory at the @absolute_path
+ * does not contain any files or folders, or if the
+ * @absolute_path does not refer to a directory. Otherwise
+ * if the @absolute_path contains atleast one entry except
+ * '.' and '..', %FALSE is returned.
+ *
+ * Return value: %TRUE if the directory at @absolute_path
+ * is empty.
+ **/
+gboolean
+_thunar_vfs_os_is_dir_empty (const gchar *absolute_path)
+{
+ struct dirent *dp;
+ gchar dbuf[8 * DIRBLKSIZ];
+ gint size = 0;
+ gint loc = 0;
+ gint fd;
+
+ /* try to open the directory */
+ fd = open (absolute_path, O_NONBLOCK | O_RDONLY);
+ if (G_LIKELY (fd >= 0))
+ {
+ /* read the directory content */
+ for (;;)
+ {
+ /* check if we need to fill the buffer again */
+ if (loc >= size)
+ {
+ /* read the next chunk */
+ size = getdents (fd, dbuf, sizeof (dbuf));
+ if (size <= 0)
+ break;
+ loc = 0;
+ }
+
+ /* grab the pointer to the next entry */
+ dp = (struct dirent *) (dbuf + loc);
+ if (G_UNLIKELY (((gulong) dp & 0x03) != 0))
+ {
+invalid:
+ size = 0;
+ break;
+ }
+
+ /* verify the next record length */
+ if (G_UNLIKELY (dp->d_reclen <= 0 || dp->d_reclen > sizeof (dbuf) + 1 - loc))
+ goto invalid;
+
+ /* adjust the location pointer */
+ loc += dp->d_reclen;
+
+ /* verify the inode and type */
+ if (G_UNLIKELY (dp->d_fileno == 0 || dp->d_type == DT_WHT))
+ continue;
+
+ /* ignore '.' and '..' entries */
+ if (G_UNLIKELY (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))))
+ continue;
+
+ /* jep, the directory is not empty */
+ break;
+ }
+
+ /* close the directory */
+ close (fd);
+ }
+
+ return (size <= 0);
+}
+
+
+
+/**
+ * _thunar_vfs_os_scandir:
+ * @path : the #ThunarVfsPath for the directory, which does
+ * not need to be a local path. The returned path
+ * list will be made of paths relative to this one.
+ * @absolute_path : the absolute local path of the directory to scan.
+ * @follow_links : %TRUE to follow symlinks to directories.
+ * @directories_return : pointer to a list into which the direct subfolders
+ * found during scanning will be placed (for recursive
+ * scanning), or %NULL if you are not interested in a
+ * separate list of subfolders. Note that the returned
+ * list items need to be freed, but the #ThunarVfsPath<!---->s
+ * in the list do not have an extra reference.
+ * @error : return location for errors or %NULL.
+ *
+ * Note that folders in a filesystem mounted via mount_union(8) may
+ * not be handled properly in all cases. But since mount_union(8) do
+ * not seem to be widely used today, we will ignore the fact and wait
+ * for the first user to complain.
+ *
+ * The list returned in @directories_return, if not %NULL, must be freed using
+ * g_list_free() when no longer needed.
+ *
+ * The returned list of #ThunarVfsPath<!---->s must be freed by the caller using
+ * thunar_vfs_path_list_unref() when no longer needed.
+ *
+ * Return value: the list of #ThunarVfsPath<!---->s in the folder at the @absolute_path,
+ * or %NULL in case of an error. Note that %NULL may also mean that the
+ * folder is empty.
+ **/
+GList*
+_thunar_vfs_os_scandir (ThunarVfsPath *path,
+ const gchar *absolute_path,
+ gboolean follow_links,
+ GList **directories_return,
+ GError **error)
+{
+ struct dirent *dp;
+ struct stat statb;
+ GList *path_list = NULL;
+ gchar *filename;
+ gchar *dbuf;
+ guint dlen;
+ gint size;
+ gint loc;
+ gint fd;
+
+ _thunar_vfs_return_val_if_fail (g_path_is_absolute (absolute_path), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* try to open the file (the file name is placed in handle->fname) */
+ fd = open (absolute_path, (follow_links ? 0 : O_NOFOLLOW) | O_NONBLOCK | O_RDONLY);
+ if (G_UNLIKELY (fd < 0))
+ {
+ /* translate EMLINK to ENOTDIR */
+ _thunar_vfs_set_g_error_from_errno (error, (errno == EMLINK) ? ENOTDIR : errno);
+ return NULL;
+ }
+
+ /* stat the file */
+ if (G_UNLIKELY (fstat (fd, &statb) < 0))
+ {
+error0:
+ _thunar_vfs_set_g_error_from_errno (error, errno);
+ goto done;
+ }
+
+ /* verify that we have a directory here */
+ if (G_UNLIKELY (!S_ISDIR (statb.st_mode)))
+ {
+ _thunar_vfs_set_g_error_from_errno (error, ENOTDIR);
+ goto done;
+ }
+
+ /* verify that we can enter the directory (else
+ * we won't get any useful infos about the dir
+ * contents either, so no need to continue). See
+ * http://bugzilla.xfce.org/show_bug.cgi?id=1408.
+ */
+ if (G_UNLIKELY ((statb.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != (S_IXUSR | S_IXGRP | S_IXOTH) && (access (absolute_path, X_OK) < 0)))
+ {
+ _thunar_vfs_set_g_error_from_errno (error, EACCES);
+ goto done;
+ }
+
+ /* close the directory on exec */
+ if (G_UNLIKELY (fcntl (fd, F_SETFD, FD_CLOEXEC) < 0))
+ goto error0;
+
+ /* calculate the directory buffer size */
+ dlen = statb.st_blksize * 8;
+ if (G_UNLIKELY ((dlen % DIRBLKSIZ) != 0))
+ dlen = ((dlen + DIRBLKSIZ - 1) / DIRBLKSIZ) * DIRBLKSIZ;
+
+ /* allocate the directory buffer, which is
+ * also used to store the statfs(2) results.
+ */
+ dbuf = alloca (dlen);
+
+ /* read the directory content */
+ for (loc = size = 0;;)
+ {
+ /* check if we need to fill the buffer again */
+ if (loc >= size)
+ {
+ /* read the next chunk */
+ size = getdents (fd, dbuf, dlen);
+ if (size <= 0)
+ break;
+ loc = 0;
+ }
+
+ /* grab the pointer to the next entry */
+ dp = (struct dirent *) (dbuf + loc);
+ if (G_UNLIKELY (((gulong) dp & 0x03) != 0))
+ break;
+
+ /* verify the next record length */
+ if (G_UNLIKELY (dp->d_reclen <= 0 || dp->d_reclen > dlen + 1 - loc))
+ break;
+
+ /* adjust the location pointer */
+ loc += dp->d_reclen;
+
+ /* verify the inode and type */
+ if (G_UNLIKELY (dp->d_fileno == 0 || dp->d_type == DT_WHT))
+ continue;
+
+ /* ignore '.' and '..' entries */
+ if (G_UNLIKELY (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))))
+ continue;
+
+ /* add the child path to the path list */
+ path_list = g_list_prepend (path_list, thunar_vfs_path_relative (path, dp->d_name));
+
+ /* check if we want to collect children for recursive scanning */
+ if (G_UNLIKELY (directories_return != NULL))
+ {
+ /* DT_UNKNOWN must be handled for certain file systems */
+ if (G_UNLIKELY (dp->d_type == DT_UNKNOWN))
+ {
+ /* stat the child (according to the FOLLOW_LINKS policy) to see if we have a directory here */
+ filename = g_build_filename (absolute_path, dp->d_name, NULL);
+ if ((follow_links ? stat (filename, &statb) : lstat (filename, &statb)) == 0 && S_ISDIR (statb.st_mode))
+ dp->d_type = DT_DIR;
+ g_free (filename);
+ }
+
+ /* check if we have a directory */
+ if (dp->d_type == DT_DIR)
+ *directories_return = g_list_prepend (*directories_return, path_list->data);
+ }
+ }
+
+done:
+ close (fd);
+ return path_list;
+}
+
+
+
+#define __THUNAR_VFS_OS_BSD_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-os-generic.c b/thunar-vfs/thunar-vfs-os-generic.c
new file mode 100644
index 0000000000000000000000000000000000000000..942f46e9bde47cf008396a072a5414d2cc132091
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-os-generic.c
@@ -0,0 +1,225 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-os.h>
+#include <thunar-vfs/thunar-vfs-path-private.h>
+#include <thunar-vfs/thunar-vfs-private.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+/* Use g_access() on win32 */
+#if GLIB_CHECK_VERSION(2,8,0) && defined(G_OS_WIN32)
+#include <glib/gstdio.h>
+#else
+#define g_access(path, mode) (access ((path), (mode)))
+#endif
+
+/* %&§$!# IRIX and Solaris */
+#if defined(__sgi__) && !defined(dirfd)
+#define dirfd(dp) (((DIR *) (dp))->__dd_fd)
+#elif defined(__sun__) && !defined(dirfd)
+#define dirfd(dp) (((DIR *) (dp))->dd_fd)
+#endif
+
+
+
+/**
+ * _thunar_vfs_os_is_dir_empty:
+ * @absolute_path : an absolute path to a folder.
+ *
+ * Returns %TRUE if the directory at the @absolute_path
+ * does not contain any files or folders, or if the
+ * @absolute_path does not refer to a directory. Otherwise
+ * if the @absolute_path contains atleast one entry except
+ * '.' and '..', %FALSE is returned.
+ *
+ * Return value: %TRUE if the directory at @absolute_path
+ * is empty.
+ **/
+gboolean
+_thunar_vfs_os_is_dir_empty (const gchar *absolute_path)
+{
+ struct dirent *dp;
+ DIR *dirp;
+
+ dirp = opendir (absolute_path);
+ if (G_LIKELY (dirp != NULL))
+ {
+ /* ignore '.' and '..' */
+ dp = readdir (dirp);
+ dp = readdir (dirp);
+ dp = readdir (dirp);
+ closedir (dirp);
+ return (dp == NULL);
+ }
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_os_scandir:
+ * @path : the #ThunarVfsPath for the directory, which does
+ * not need to be a local path. The returned path
+ * list will be made of paths relative to this one.
+ * @absolute_path : the absolute local path of the directory to scan.
+ * @follow_links : %TRUE to follow symlinks to directories.
+ * @directories_return : pointer to a list into which the direct subfolders
+ * found during scanning will be placed (for recursive
+ * scanning), or %NULL if you are not interested in a
+ * separate list of subfolders. Note that the returned
+ * list items need to be freed, but the #ThunarVfsPath<!---->s
+ * in the list do not have an extra reference.
+ * @error : return location for errors or %NULL.
+ *
+ * The list returned in @directories_return, if not %NULL, must be freed using
+ * g_list_free() when no longer needed.
+ *
+ * The returned list of #ThunarVfsPath<!---->s must be freed by the caller using
+ * thunar_vfs_path_list_unref() when no longer needed.
+ *
+ * Return value: the list of #ThunarVfsPath<!---->s in the folder at the @absolute_path,
+ * or %NULL in case of an error. Note that %NULL may also mean that the
+ * folder is empty.
+ **/
+GList*
+_thunar_vfs_os_scandir (ThunarVfsPath *path,
+ const gchar *absolute_path,
+ gboolean follow_links,
+ GList **directories_return,
+ GError **error)
+{
+ struct dirent *dp;
+ struct stat fstatb;
+ struct stat statb;
+ GList *path_list = NULL;
+ gchar *filename;
+ DIR *dirp;
+
+ _thunar_vfs_return_val_if_fail (g_path_is_absolute (absolute_path), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* try to open the directory */
+ dirp = opendir (absolute_path);
+ if (G_UNLIKELY (dirp == NULL))
+ {
+ _thunar_vfs_set_g_error_from_errno (error, errno);
+ return NULL;
+ }
+
+ /* stat the just opened directory */
+ if (fstat (dirfd (dirp), &fstatb) < 0)
+ goto error;
+
+ /* verify that the directory is really the directory we want
+ * to open. If not, we've probably detected a race condition,
+ * so we'll better stop rather than doing anything stupid
+ * (remember, this method is also used in collecting
+ * files for the unlink job!!). Better safe than sorry!
+ */
+ if (G_UNLIKELY (!follow_links))
+ {
+ /* stat the path (without following links) */
+ if (lstat (absolute_path, &statb) < 0)
+ goto error;
+
+ /* check that we have the same file here */
+ if (fstatb.st_ino != statb.st_ino || fstatb.st_dev != statb.st_dev)
+ {
+ errno = ENOTDIR;
+ goto error;
+ }
+ }
+
+ /* verify that we can enter the directory (else
+ * we won't get any useful infos about the dir
+ * contents either, so no need to continue). See
+ * http://bugzilla.xfce.org/show_bug.cgi?id=1408.
+ */
+ if ((fstatb.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != (S_IXUSR | S_IXGRP | S_IXOTH) && (g_access (absolute_path, X_OK) < 0))
+ {
+ errno = EACCES;
+ goto error;
+ }
+
+ /* read the directory content */
+ for (;;)
+ {
+ /* read the next directory entry */
+ dp = readdir (dirp);
+ if (G_UNLIKELY (dp == NULL))
+ break;
+
+ /* ignore '.' and '..' entries */
+ if (G_UNLIKELY (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))))
+ continue;
+
+ /* add the child path to the path list */
+ path_list = g_list_prepend (path_list, thunar_vfs_path_relative (path, dp->d_name));
+
+ /* check if we want to collect children for recursive scanning */
+ if (G_UNLIKELY (directories_return != NULL))
+ {
+ /* determine the absolute path to the child */
+ filename = g_build_filename (absolute_path, dp->d_name, NULL);
+
+ /* check if we have a directory here (according to the FOLLOW_LINKS policy) */
+ if ((follow_links ? stat (filename, &statb) : lstat (filename, &statb)) == 0 && S_ISDIR (statb.st_mode))
+ *directories_return = g_list_prepend (*directories_return, path_list->data);
+
+ /* cleanup */
+ g_free (filename);
+ }
+ }
+
+done:
+ closedir (dirp);
+ return path_list;
+
+error:
+ _thunar_vfs_set_g_error_from_errno (error, errno);
+ goto done;
+}
+
+
+
+#define __THUNAR_VFS_OS_GENERIC_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-scandir.h b/thunar-vfs/thunar-vfs-os.h
similarity index 53%
rename from thunar-vfs/thunar-vfs-scandir.h
rename to thunar-vfs/thunar-vfs-os.h
index f9609b581c25feb762e68f71704eab7a8591d908..2fd88cd178b1ee08f313f55d2b2acffad29280fd 100644
--- a/thunar-vfs/thunar-vfs-scandir.h
+++ b/thunar-vfs/thunar-vfs-os.h
@@ -18,30 +18,25 @@
* Boston, MA 02111-1307, USA.
*/
-#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
-#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
#endif
-#ifndef __THUNAR_VFS_SCANDIR_H__
-#define __THUNAR_VFS_SCANDIR_H__
+#ifndef __THUNAR_VFS_OS_H__
+#define __THUNAR_VFS_OS_H__
-#include <thunar-vfs/thunar-vfs-path.h>
-#include <thunar-vfs/thunar-vfs-types.h>
+#include <thunar-vfs/thunar-vfs-path-private.h>
G_BEGIN_DECLS;
-typedef enum /*< flags >*/
-{
- THUNAR_VFS_SCANDIR_RECURSIVE = (1L << 0),
- THUNAR_VFS_SCANDIR_FOLLOW_LINKS = (1L << 1),
-} ThunarVfsScandirFlags;
+gboolean _thunar_vfs_os_is_dir_empty (const gchar *absolute_path) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
-GList *thunar_vfs_scandir (ThunarVfsPath *path,
- volatile gboolean *cancelled,
- ThunarVfsScandirFlags flags,
- GCompareFunc func,
- GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+GList *_thunar_vfs_os_scandir (ThunarVfsPath *path,
+ const gchar *absolute_path,
+ gboolean follow_links,
+ GList **directories_return,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
G_END_DECLS;
-#endif /* !__THUNAR_VFS_SCANDIR_H__ */
+#endif /* !__THUNAR_VFS_OS_H__ */
diff --git a/thunar-vfs/thunar-vfs-path-private.h b/thunar-vfs/thunar-vfs-path-private.h
new file mode 100644
index 0000000000000000000000000000000000000000..45cbfd78217c3ea042ece8de0e094e6b93fc57fb
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-path-private.h
@@ -0,0 +1,95 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_PATH_PRIVATE_H__
+#define __THUNAR_VFS_PATH_PRIVATE_H__
+
+#include <thunar-vfs/thunar-vfs-path.h>
+
+G_BEGIN_DECLS;
+
+/* Support macros for compilers that don't support proper inlining */
+#define thunar_vfs_path_ref(path) (exo_atomic_inc (&(THUNAR_VFS_PATH ((path))->ref_count)), path)
+#define thunar_vfs_path_is_root(path) (THUNAR_VFS_PATH ((path))->parent == NULL)
+#define thunar_vfs_path_get_name(path) (((const gchar *) path) + sizeof (ThunarVfsPath))
+#define thunar_vfs_path_get_parent(path) (THUNAR_VFS_PATH ((path))->parent)
+#define thunar_vfs_path_get_scheme(path) (THUNAR_VFS_PATH ((path))->ref_count & THUNAR_VFS_PATH_SCHEME_MASK)
+
+/* global shared variables */
+extern ThunarVfsPath *_thunar_vfs_path_trash_root G_GNUC_INTERNAL;
+
+/* initialization/shutdown routines */
+void _thunar_vfs_path_init (void) G_GNUC_INTERNAL;
+void _thunar_vfs_path_shutdown (void) G_GNUC_INTERNAL;
+
+/* internal support methods */
+ThunarVfsPath *_thunar_vfs_path_new_relative (ThunarVfsPath *parent,
+ const gchar *relative_path) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar *_thunar_vfs_path_dup_display_name (const ThunarVfsPath *path) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+ThunarVfsPath *_thunar_vfs_path_translate (ThunarVfsPath *src_path,
+ ThunarVfsPathScheme dst_scheme,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar *_thunar_vfs_path_translate_dup_string (ThunarVfsPath *src_path,
+ ThunarVfsPathScheme dst_scheme,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+/**
+ * _thunar_vfs_path_unref_nofree:
+ * @path : a #ThunarVfsPath.
+ *
+ * Decrements the reference count on @path without checking whether the
+ * reference count reached zero and thereby freeing the @path resources.
+ * Use this method with care and only if you are absolutely sure that
+ * the reference count is larger than one. Otherwise you'll leak the
+ * @path memory.
+ **/
+#define _thunar_vfs_path_unref_nofree(path) \
+G_STMT_START{ \
+ exo_atomic_dec (&(THUNAR_VFS_PATH ((path))->ref_count)); \
+}G_STMT_END
+
+/**
+ * _thunar_vfs_path_is_local:
+ * @path : a #ThunarVfsPath.
+ *
+ * Returns %TRUE if the @path<!---->s scheme is %THUNAR_VFS_PATH_SCHEME_FILE.
+ *
+ * Return value: %TRUE if @path is %THUNAR_VFS_PATH_SCHEME_FILE.
+ **/
+#define _thunar_vfs_path_is_local(path) (thunar_vfs_path_get_scheme ((path)) == THUNAR_VFS_PATH_SCHEME_FILE)
+
+/**
+ * _thunar_vfs_path_is_trash:
+ * @path : a #ThunarVfsPath.
+ *
+ * Returns %TRUE if the @path<!---->s scheme is %THUNAR_VFS_PATH_SCHEME_TRASH.
+ *
+ * Return value: %TRUE if @path is %THUNAR_VFS_PATH_SCHEME_TRASH.
+ **/
+#define _thunar_vfs_path_is_trash(path) (thunar_vfs_path_get_scheme ((path)) == THUNAR_VFS_PATH_SCHEME_TRASH)
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_PATH_PRIVATE_H__ */
+
diff --git a/thunar-vfs/thunar-vfs-path.c b/thunar-vfs/thunar-vfs-path.c
index a418d093a1f52fdfac33c1658d466a5d42a2a1d8..75cdd63fda121e333c02b2cb3dff8c9f7fed6934 100644
--- a/thunar-vfs/thunar-vfs-path.c
+++ b/thunar-vfs/thunar-vfs-path.c
@@ -22,6 +22,9 @@
#include <config.h>
#endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
#ifdef HAVE_MEMORY_H
#include <memory.h>
#endif
@@ -34,11 +37,14 @@
#define __THUNAR_VFS_PATH_C__
#include <thunar-vfs/thunar-vfs-path.h>
+#include <thunar-vfs/thunar-vfs-io-trash.h>
+#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-util.h>
#include <thunar-vfs/thunar-vfs-alias.h>
+/* Masks to handle the 4-byte aligned path names */
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
#define THUNAR_VFS_PATH_MASK (0xffu << ((sizeof (guint) - 1) * 8))
#define THUNAR_VFS_PATH_ROOT (0x2fu)
@@ -80,25 +86,85 @@ static const gchar HEX_CHARS[16] = "0123456789ABCDEF";
+/* Debugging support in ThunarVfsPath */
#ifdef G_ENABLE_DEBUG
+
G_LOCK_DEFINE_STATIC (debug_paths);
static GList *debug_paths = NULL;
-#endif
+
+#define THUNAR_VFS_PATH_DEBUG_INSERT(path) \
+G_STMT_START{ \
+ G_LOCK (debug_paths); \
+ debug_paths = g_list_prepend (debug_paths, (path)); \
+ G_UNLOCK (debug_paths); \
+}G_STMT_END
+
+#define THUNAR_VFS_PATH_DEBUG_REMOVE(path) \
+G_STMT_START{ \
+ G_LOCK (debug_paths); \
+ debug_paths = g_list_remove (debug_paths, (path)); \
+ G_UNLOCK (debug_paths); \
+}G_STMT_END
+
+#define THUNAR_VFS_PATH_DEBUG_SHUTDOWN() \
+G_STMT_START{ \
+ if (G_UNLIKELY (debug_paths != NULL)) \
+ { \
+ GList *lp; \
+ gchar *uri; \
+ gint n; \
+ G_LOCK (debug_paths); \
+ g_print ("--- Leaked a total of %u ThunarVfsPath objects:\n", g_list_length (debug_paths)); \
+ for (lp = debug_paths; lp != NULL; lp = lp->next) \
+ { \
+ uri = thunar_vfs_path_dup_string (lp->data); \
+ n = ((ThunarVfsPath *) lp->data)->ref_count; \
+ g_print ("--> %s (%d)\n", uri, (n & ~THUNAR_VFS_PATH_SCHEME_MASK)); \
+ g_free (uri); \
+ } \
+ G_UNLOCK (debug_paths); \
+ } \
+}G_STMT_END
+
+#else /* !G_ENABLE_DEBUG */
+
+#define THUNAR_VFS_PATH_DEBUG_INSERT(path) G_STMT_START{ (void)0; }G_STMT_END
+#define THUNAR_VFS_PATH_DEBUG_REMOVE(path) G_STMT_START{ (void)0; }G_STMT_END
+#define THUNAR_VFS_PATH_DEBUG_SHUTDOWN() G_STMT_START{ (void)0; }G_STMT_END
+
+#endif /* !G_ENABLE_DEBUG */
+
+
+
+/* components of the path to the users home folder */
static ThunarVfsPath **home_components;
static guint n_home_components;
+/**
+ * _thunar_vfs_path_trash_root:
+ *
+ * The shared instance of the #ThunarVfsPath that points to the
+ * trash root folder.
+ **/
+ThunarVfsPath *_thunar_vfs_path_trash_root = NULL;
+
static guint
thunar_vfs_path_escape_uri_length (const ThunarVfsPath *path)
{
const guchar *s;
- guint length = 8; /* base size for 'file:///' */
+ guint base_length;
+ guint length;
+
+ /* determine the base length for the scheme (file:/// or trash:///) */
+ length = base_length = _thunar_vfs_path_is_local (path) ? 8 : 9;
+ /* determine the length for the path part */
for (; path->parent != NULL; path = path->parent)
{
/* prepend a path separator */
- if (length > 8)
+ if (length > base_length)
length += 1;
for (s = (const guchar *) thunar_vfs_path_get_name (path); *s != '\0'; ++s)
@@ -124,20 +190,38 @@ thunar_vfs_path_escape_uri (const ThunarVfsPath *path,
ThunarVfsPathItem *root = NULL;
const gchar *s;
guchar c;
- gchar *t = buffer + 8;
+ gchar *t;
- /* prepend the 'file:///' string (using a simple optimization on i386/ppc) */
+ /* prepend 'trash:///' or 'file:///' string (using a simple optimization on i386/ppc) */
+ if (G_LIKELY (thunar_vfs_path_get_scheme (path) == THUNAR_VFS_PATH_SCHEME_FILE))
+ {
+#if defined(__GNUC__) && (defined(__i386__) || defined(__ppc__))
+ ((guint32 *) buffer)[0] = ((const guint32 *) "file:///")[0];
+ ((guint32 *) buffer)[1] = ((const guint32 *) "file:///")[1];
+#else
+ /* hopefully the compiler will be able to optimize this */
+ buffer[0] = 'f'; buffer[1] = 'i';
+ buffer[2] = 'l'; buffer[3] = 'e';
+ buffer[4] = ':'; buffer[5] = '/';
+ buffer[6] = '/'; buffer[7] = '/';
+#endif
+ t = buffer + 8;
+ }
+ else
+ {
#if defined(__GNUC__) && (defined(__i386__) || defined(__ppc__))
- s = "file:///";
- ((guint32 *) buffer)[0] = ((const guint32 *) s)[0];
- ((guint32 *) buffer)[1] = ((const guint32 *) s)[1];
+ ((guint32 *) buffer)[0] = ((const guint32 *) "trash://")[0];
+ ((guint32 *) buffer)[1] = ((const guint32 *) "trash://")[1];
#else
- /* hopefully the compiler will be able to optimize this */
- buffer[0] = 'f'; buffer[1] = 'i';
- buffer[2] = 'l'; buffer[3] = 'e';
- buffer[4] = ':'; buffer[5] = '/';
- buffer[6] = '/'; buffer[7] = '/';
+ /* hopefully the compiler will be able to optimize this */
+ buffer[0] = 't'; buffer[1] = 'r';
+ buffer[2] = 'a'; buffer[3] = 's';
+ buffer[4] = 'h'; buffer[5] = ':';
+ buffer[6] = '/'; buffer[7] = '/';
#endif
+ buffer[8] = '/';
+ t = buffer + 9;
+ }
/* generate the path item list (reverse parent relation) */
for (; path->parent != NULL; path = path->parent)
@@ -159,7 +243,7 @@ thunar_vfs_path_escape_uri (const ThunarVfsPath *path,
for (s = thunar_vfs_path_get_name (item->path); *s != '\0'; ++s)
{
c = *((const guchar *) s);
- if (!ACCEPTABLE_URI_CHAR (c))
+ if (G_UNLIKELY (!ACCEPTABLE_URI_CHAR (c)))
{
*t++ = '%';
*t++ = HEX_CHARS[c >> 4];
@@ -197,6 +281,23 @@ thunar_vfs_path_get_type (void)
+GType
+thunar_vfs_path_list_get_type (void)
+{
+ static GType type = G_TYPE_INVALID;
+
+ if (G_UNLIKELY (type == G_TYPE_INVALID))
+ {
+ type = g_boxed_type_register_static (I_("ThunarVfsPathList"),
+ (GBoxedCopyFunc) thunar_vfs_path_list_copy,
+ (GBoxedFreeFunc) thunar_vfs_path_list_free);
+ }
+
+ return type;
+}
+
+
+
/**
* thunar_vfs_path_new:
* @identifier : an URI identifier or an absolute path.
@@ -218,8 +319,7 @@ ThunarVfsPath*
thunar_vfs_path_new (const gchar *identifier,
GError **error)
{
- ThunarVfsPath *parent;
- ThunarVfsPath *path = NULL;
+ ThunarVfsPath *path = home_components[0]; /* default to file system root */
const gchar *s;
const gchar *s1;
const gchar *s2;
@@ -231,9 +331,37 @@ thunar_vfs_path_new (const gchar *identifier,
if (G_UNLIKELY (*identifier != G_DIR_SEPARATOR))
{
/* treat the identifier as URI */
- filename = g_filename_from_uri (identifier, NULL, error);
+ filename = g_filename_from_uri (identifier, NULL, NULL);
if (G_UNLIKELY (filename == NULL))
- return NULL;
+ {
+ /* hey, but maybe it's a trash:-URI */
+ if (G_LIKELY (identifier[0] == 't' && identifier[1] == 'r' && identifier[2] == 'a'
+ && identifier[3] == 's' && identifier[4] == 'h' && identifier[5] == ':'))
+ {
+ /* skip slashes (yes, not dir separators) */
+ for (s = identifier + 6; *s == '/'; ++s)
+ ;
+
+ /* start at the trash root folder */
+ path = _thunar_vfs_path_trash_root;
+
+ /* check if it's the trash root folder */
+ if (G_LIKELY (*s == '\0'))
+ return thunar_vfs_path_ref (path);
+
+ /* try to interpret the file part */
+ t = g_strconcat ("file:/", s, NULL);
+ filename = g_filename_from_uri (t, NULL, NULL);
+ g_free (t);
+ }
+ }
+
+ /* check if the URI is invalid */
+ if (G_UNLIKELY (filename == NULL))
+ {
+ g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_BAD_URI, _("The URI \"%s\" is invalid"), identifier);
+ return NULL;
+ }
}
else
{
@@ -241,73 +369,42 @@ thunar_vfs_path_new (const gchar *identifier,
filename = thunar_vfs_canonicalize_filename (identifier);
}
- /* start at the root path */
- path = home_components[0];
- for (n = 1, s = filename + 1; n < n_home_components; ++n)
- {
- /* skip additional slashes */
- for (; G_UNLIKELY (*s == G_DIR_SEPARATOR); ++s)
- ;
-
- /* check if we have reached the end of the filename */
- if (G_UNLIKELY (*s == '\0'))
- break;
-
- /* check if the path component equals the next home path component */
- for (s1 = thunar_vfs_path_get_name (home_components[n]), s2 = s; *s1 != '\0' && *s1 == *s2; ++s1, ++s2)
- ;
- if (*s1 != '\0' || (*s2 != '\0' && *s2 != G_DIR_SEPARATOR))
- break;
-
- /* go on with the next home path component */
- path = home_components[n];
- s = s2;
- }
-
- /* skip additional slashes */
- for (; G_UNLIKELY (*s == G_DIR_SEPARATOR); ++s)
- ;
+ /* parse the filename to a ThunarVfsPath */
+ s = filename + 1;
- /* generate the additional path components (if any) */
- while (*s != '\0')
+ /* local paths may be relative to a home component */
+ if (G_LIKELY (path == home_components[0]))
{
- /* remember the current path as parent path */
- parent = path;
-
- /* determine the length of the path component in bytes */
- for (s1 = s + 1; *s1 != '\0' && *s1 != G_DIR_SEPARATOR; ++s1)
- ;
- n = (((s1 - s) + sizeof (guint)) / sizeof (guint)) * sizeof (guint);
-
- /* allocate memory for the new path component */
- path = g_malloc (sizeof (ThunarVfsPath) + n);
- path->ref_count = 0;
- path->parent = thunar_vfs_path_ref (parent);
+ /* start at the root path */
+ for (n = 1; n < n_home_components; ++n)
+ {
+ /* skip additional slashes */
+ for (; G_UNLIKELY (*s == G_DIR_SEPARATOR); ++s)
+ ;
- /* add the path to the debug list */
-#ifdef G_ENABLE_DEBUG
- G_LOCK (debug_paths);
- debug_paths = g_list_prepend (debug_paths, path);
- G_UNLOCK (debug_paths);
-#endif
+ /* check if we have reached the end of the filename */
+ if (G_UNLIKELY (*s == '\0'))
+ break;
- /* zero out the last word to have the name zero-terminated */
- *(((guint *) (((gchar *) path) + sizeof (ThunarVfsPath) + n)) - 1) = 0;
-
- /* copy the path component name */
- for (t = (gchar *) thunar_vfs_path_get_name (path); *s != '\0' && *s != G_DIR_SEPARATOR; )
- *t++ = *s++;
+ /* check if the path component equals the next home path component */
+ for (s1 = thunar_vfs_path_get_name (home_components[n]), s2 = s; *s1 != '\0' && *s1 == *s2; ++s1, ++s2)
+ ;
+ if (*s1 != '\0' || (*s2 != '\0' && *s2 != G_DIR_SEPARATOR))
+ break;
- /* skip additional slashes */
- for (; G_UNLIKELY (*s == G_DIR_SEPARATOR); ++s)
- ;
+ /* go on with the next home path component */
+ path = home_components[n];
+ s = s2;
+ }
}
+ /* determine the subpath (takes appropriate references) */
+ path = _thunar_vfs_path_new_relative (path, s);
+
/* cleanup */
g_free (filename);
- /* return a reference on the path */
- return thunar_vfs_path_ref (path);
+ return path;
}
@@ -337,7 +434,7 @@ thunar_vfs_path_get_for_home (void)
* thunar_vfs_path_get_for_root:
*
* Returns the #ThunarVfsPath that represents the
- * file systems root directory.
+ * file systems root folder.
*
* The caller is responsible to free the returned
* object using thunar_vfs_path_unref() when no
@@ -354,6 +451,27 @@ thunar_vfs_path_get_for_root (void)
+/**
+ * thunar_vfs_path_get_for_trash:
+ *
+ * Returns the #ThunarVfsPath that represents the
+ * trash root folder.
+ *
+ * The caller is responsible to free the returned
+ * object using thunar_vfs_path_unref() when no
+ * longer needed.
+ *
+ * Return value: the #ThunarVfsPath for the trash
+ * root folder.
+ **/
+ThunarVfsPath*
+thunar_vfs_path_get_for_trash (void)
+{
+ return thunar_vfs_path_ref (_thunar_vfs_path_trash_root);
+}
+
+
+
/**
* thunar_vfs_path_unref:
* @path : a #ThunarVfsPath.
@@ -366,21 +484,44 @@ void
thunar_vfs_path_unref (ThunarVfsPath *path)
{
ThunarVfsPath *parent;
+ const guint *p;
- while (path != NULL && exo_atomic_dec (&path->ref_count))
+ while (path != NULL && (g_atomic_int_exchange_and_add (&path->ref_count, -1) & ~THUNAR_VFS_PATH_SCHEME_MASK) == 1)
{
+ /* verify that we don't free the paths for trash root or home components */
+#ifdef G_ENABLE_DEBUG
+ if (G_UNLIKELY (path == _thunar_vfs_path_trash_root))
+ {
+ /* the trash root path may not be freed */
+ g_error (G_STRLOC ": Attempt to free the trash root path detected");
+ }
+ else
+ {
+ /* same for the home component paths */
+ guint n;
+ for (n = 0; n < n_home_components; ++n)
+ if (G_UNLIKELY (path == home_components[n]))
+ break;
+
+ /* check if one of the home components matched */
+ if (G_UNLIKELY (n < n_home_components))
+ {
+ /* none of the home component paths can be freed this way */
+ g_error (G_STRLOC ": Attempt to free the home component path \"%s\" detected", thunar_vfs_path_get_name (path));
+ }
+ }
+#endif
+
/* remember the parent path */
parent = path->parent;
/* remove the path from the debug list */
-#ifdef G_ENABLE_DEBUG
- G_LOCK (debug_paths);
- debug_paths = g_list_remove (debug_paths, path);
- G_UNLOCK (debug_paths);
-#endif
+ THUNAR_VFS_PATH_DEBUG_REMOVE (path);
- /* release the path resources */
- g_free (path);
+ /* release the path resources (we need to determine the size for the slice allocator) */
+ for (p = (const guint *) thunar_vfs_path_get_name (path); (*p & THUNAR_VFS_PATH_MASK) != 0u; ++p)
+ ;
+ _thunar_vfs_slice_free1 (((const guint8 *) (p + 1)) - ((const guint8 *) path), path);
/* continue with the parent */
path = parent;
@@ -401,7 +542,7 @@ guint
thunar_vfs_path_hash (gconstpointer path_ptr)
{
const gchar *p = thunar_vfs_path_get_name (path_ptr);
- guint h = *p;
+ guint h = *p + thunar_vfs_path_get_scheme (path_ptr);
/* hash the last path component (which cannot be empty) */
while (*++p != '\0')
@@ -432,6 +573,10 @@ thunar_vfs_path_equal (gconstpointer path_ptr_a,
const guint *a;
const guint *b;
+ /* compare the schemes */
+ if (thunar_vfs_path_get_scheme (path_a) != thunar_vfs_path_get_scheme (path_b))
+ return FALSE;
+
again:
/* check if the paths are the same object */
if (G_UNLIKELY (path_a == path_b))
@@ -506,22 +651,19 @@ thunar_vfs_path_relative (ThunarVfsPath *parent,
/* determine the length of the name in bytes */
for (s = name + 1; *s != '\0'; ++s)
;
- n = (((s - name) + sizeof (guint)) / sizeof (guint)) * sizeof (guint);
+ n = (((s - name) + sizeof (guint)) / sizeof (guint)) * sizeof (guint)
+ + sizeof (ThunarVfsPath);
/* allocate memory for the new path component */
- path = g_malloc (sizeof (ThunarVfsPath) + n);
- path->ref_count = 1;
+ path = _thunar_vfs_slice_alloc (n);
+ path->ref_count = 1 | thunar_vfs_path_get_scheme (parent);
path->parent = thunar_vfs_path_ref (parent);
- /* add the path to the debug list */
-#ifdef G_ENABLE_DEBUG
- G_LOCK (debug_paths);
- debug_paths = g_list_prepend (debug_paths, path);
- G_UNLOCK (debug_paths);
-#endif
+ /* insert the path into the debug list */
+ THUNAR_VFS_PATH_DEBUG_INSERT (path);
/* zero out the last word to have the name zero-terminated */
- *(((guint *) (((gchar *) path) + sizeof (ThunarVfsPath) + n)) - 1) = 0;
+ *(((guint *) (((gchar *) path) + n)) - 1) = 0;
/* copy the path component name */
for (s = name, t = (gchar *) thunar_vfs_path_get_name (path); *s != '\0'; )
@@ -744,8 +886,8 @@ thunar_vfs_path_dup_uri (const ThunarVfsPath *path)
m = thunar_vfs_path_escape_uri (path, s);
/* verify the result */
- g_assert (strlen (s) == m - 1);
- g_assert (m == n);
+ _thunar_vfs_assert (strlen (s) == m - 1);
+ _thunar_vfs_assert (m == n);
return s;
}
@@ -801,8 +943,8 @@ thunar_vfs_path_to_uri (const ThunarVfsPath *path,
m = thunar_vfs_path_escape_uri (path, buffer);
/* verify the result */
- g_assert (strlen (buffer) == m - 1);
- g_assert (m == n);
+ _thunar_vfs_assert (strlen (buffer) == m - 1);
+ _thunar_vfs_assert (m == n);
return n;
}
@@ -916,8 +1058,8 @@ thunar_vfs_path_list_to_string (GList *path_list)
{
for (;;)
{
- /* increase the buffer automatically if required */
- n = thunar_vfs_path_to_uri (lp->data, buffer + bufpos, bufsize - bufpos, NULL);
+ /* increase the buffer automatically if required (already including the line break) */
+ n = thunar_vfs_path_to_uri (lp->data, buffer + bufpos, bufsize - (bufpos + 1), NULL);
if (G_UNLIKELY (n < 0))
{
bufsize += 512;
@@ -929,11 +1071,6 @@ thunar_vfs_path_list_to_string (GList *path_list)
bufpos += (n - 1);
/* append a line break */
- if (G_UNLIKELY (bufpos == bufsize))
- {
- bufsize += 512;
- buffer = g_realloc (buffer, bufsize + 1);
- }
buffer[bufpos++] = '\n';
break;
}
@@ -947,6 +1084,48 @@ thunar_vfs_path_list_to_string (GList *path_list)
+/**
+ * thunar_vfs_path_list_copy:
+ * @path_list : a list of #ThunarVfsPath<!---->s.
+ *
+ * Takes a deep copy of @path_list and returns the
+ * result. The caller is responsible to free the
+ * returned list using thunar_vfs_path_list_free().
+ *
+ * Return value: a deep copy of @path_list.
+ **/
+GList*
+thunar_vfs_path_list_copy (GList *path_list)
+{
+ GList *list;
+ GList *lp;
+
+ for (list = NULL, lp = g_list_last (path_list); lp != NULL; lp = lp->prev)
+ list = g_list_prepend (list, thunar_vfs_path_ref (lp->data));
+
+ return list;
+}
+
+
+
+/**
+ * thunar_vfs_path_list_free:
+ * @path_list : a list of #ThunarVfsPath<!---->s.
+ *
+ * Frees the #ThunarVfsPath<!---->s in @path_list and
+ * the @path_list itself.
+ **/
+void
+thunar_vfs_path_list_free (GList *path_list)
+{
+ GList *lp;
+ for (lp = path_list; lp != NULL; lp = lp->next)
+ thunar_vfs_path_unref (lp->data);
+ g_list_free (path_list);
+}
+
+
+
/**
* _thunar_vfs_path_init:
*
@@ -964,15 +1143,15 @@ _thunar_vfs_path_init (void)
guint n = 0;
gchar *t;
- g_return_if_fail (home_components == NULL);
- g_return_if_fail (n_home_components == 0);
+ _thunar_vfs_return_if_fail (home_components == NULL);
+ _thunar_vfs_return_if_fail (n_home_components == 0);
/* include the root element */
n_bytes = sizeof (ThunarVfsPath) + sizeof (guint);
n_home_components = 1;
/* split the home path into its components */
- components = g_strsplit (xfce_get_homedir (), "/", -1);
+ components = g_strsplit (g_get_home_dir (), "/", -1);
for (component = components; *component != NULL; ++component)
if (G_LIKELY (**component != '\0'))
{
@@ -1017,6 +1196,12 @@ _thunar_vfs_path_init (void)
/* verify state */
g_assert (n_home_components == n + 1);
+ /* allocate the trash root path */
+ _thunar_vfs_path_trash_root = g_malloc (sizeof (ThunarVfsPath) + sizeof (guint));
+ _thunar_vfs_path_trash_root->ref_count = 1 | THUNAR_VFS_PATH_SCHEME_TRASH;
+ _thunar_vfs_path_trash_root->parent = NULL;
+ *((guint *) thunar_vfs_path_get_name (_thunar_vfs_path_trash_root)) = THUNAR_VFS_PATH_ROOT;
+
/* cleanup */
g_strfreev (components);
}
@@ -1033,37 +1218,223 @@ _thunar_vfs_path_shutdown (void)
{
guint n;
- g_return_if_fail (home_components != NULL);
- g_return_if_fail (n_home_components != 0);
+ _thunar_vfs_return_if_fail (home_components != NULL);
+ _thunar_vfs_return_if_fail (n_home_components != 0);
/* print out the list of leaked paths */
-#ifdef G_ENABLE_DEBUG
- if (G_UNLIKELY (debug_paths != NULL))
+ THUNAR_VFS_PATH_DEBUG_SHUTDOWN ();
+
+ for (n = 0; n < n_home_components; ++n)
+ g_assert (home_components[n]->ref_count == 1);
+
+ g_free (home_components);
+ home_components = NULL;
+ n_home_components = 0;
+
+ g_assert (_thunar_vfs_path_trash_root->ref_count == (1 | THUNAR_VFS_PATH_SCHEME_TRASH));
+ g_free (_thunar_vfs_path_trash_root);
+ _thunar_vfs_path_trash_root = NULL;
+}
+
+
+
+/**
+ * _thunar_vfs_path_new_relative:
+ * @parent : the parent path.
+ * @relative_path : a relative path, or the empty string.
+ *
+ * Creates a new #ThunarVfsPath, which represents the subpath of @parent,
+ * identified by the @relative_path. If @relative_path is the empty string,
+ * a new reference to @parent will be returned.
+ *
+ * The caller is responsible to free the returned #ThunarVfsPath object
+ * using thunar_vfs_path_unref() when no longer needed.
+ *
+ * Return value: the #ThunarVfsPath object to the subpath of @parent
+ * identified by @relative_path.
+ **/
+ThunarVfsPath*
+_thunar_vfs_path_new_relative (ThunarVfsPath *parent,
+ const gchar *relative_path)
+{
+ ThunarVfsPath *path = parent;
+ const gchar *s1;
+ const gchar *s = relative_path;
+ gchar *t;
+ guint n;
+
+ _thunar_vfs_return_val_if_fail (relative_path != NULL, NULL);
+ _thunar_vfs_return_val_if_fail (parent != NULL, NULL);
+
+ /* skip additional slashes */
+ for (; G_UNLIKELY (*s == G_DIR_SEPARATOR); ++s)
+ ;
+
+ /* generate the additional path components (if any) */
+ while (*s != '\0')
{
- GList *lp;
- gchar *s;
+ /* remember the current path as parent path */
+ parent = path;
+
+ /* determine the length of the path component in bytes */
+ for (s1 = s + 1; *s1 != '\0' && *s1 != G_DIR_SEPARATOR; ++s1)
+ ;
+ n = (((s1 - s) + sizeof (guint)) / sizeof (guint)) * sizeof (guint)
+ + sizeof (ThunarVfsPath);
+
+ /* allocate memory for the new path component */
+ path = _thunar_vfs_slice_alloc (n);
+ path->ref_count = thunar_vfs_path_get_scheme (parent);
+ path->parent = thunar_vfs_path_ref (parent);
- G_LOCK (debug_paths);
+ /* insert the path into the debug list */
+ THUNAR_VFS_PATH_DEBUG_INSERT (path);
+
+ /* zero out the last word to have the name zero-terminated */
+ *(((guint *) (((gchar *) path) + n)) - 1) = 0;
- g_print ("--- Leaked a total of %u ThunarVfsPath objects:\n", g_list_length (debug_paths));
+ /* copy the path component name */
+ for (t = (gchar *) thunar_vfs_path_get_name (path); *s != '\0' && *s != G_DIR_SEPARATOR; )
+ *t++ = *s++;
- for (lp = debug_paths; lp != NULL; lp = lp->next)
+ /* skip additional slashes */
+ for (; G_UNLIKELY (*s == G_DIR_SEPARATOR); ++s)
+ ;
+ }
+
+ /* return a reference to the path */
+ return thunar_vfs_path_ref (path);
+}
+
+
+
+/**
+ * _thunar_vfs_path_dup_display_name:
+ * @path : a #ThunarVfsPath.
+ *
+ * Returns the display name for the @path<!---->s name. That said,
+ * the method is similar to thunar_vfs_path_get_name(), but the
+ * returned string is garantied to be valid UTF-8.
+ *
+ * The caller is responsible to free the returned string using
+ * g_free() when no longer needed.
+ *
+ * Return value: a displayable variant of the @path<!---->s name.
+ **/
+gchar*
+_thunar_vfs_path_dup_display_name (const ThunarVfsPath *path)
+{
+ return g_filename_display_name (thunar_vfs_path_get_name (path));
+}
+
+
+
+/**
+ * _thunar_vfs_path_translate:
+ * @src_path : the source #ThunarVfsPath.
+ * @dst_scheme : the destination #ThunarVfsPathScheme.
+ * @error : return location for errors or %NULL.
+ *
+ * Translates the @src_path to the specified @dst_scheme if possible.
+ *
+ * If the @src_path is already in the @dst_scheme, a new reference
+ * on @src_path will be returned.
+ *
+ * The caller is responsible to free the returned #ThunarVfsPath using
+ * thunar_vfs_path_unref() when no longer needed.
+ *
+ * Return value: the #ThunarVfsPath that corresponds to @src_path in the
+ * @dst_scheme, or %NULL on error.
+ **/
+ThunarVfsPath*
+_thunar_vfs_path_translate (ThunarVfsPath *src_path,
+ ThunarVfsPathScheme dst_scheme,
+ GError **error)
+{
+ ThunarVfsPathScheme src_scheme;
+ ThunarVfsPath *dst_path = NULL;
+ gchar *absolute_path;
+
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* check if the src_path is already in dst_scheme */
+ src_scheme = thunar_vfs_path_get_scheme (src_path);
+ if (G_LIKELY (dst_scheme == src_scheme))
+ return thunar_vfs_path_ref (src_path);
+
+ /* we can translate trash:-URIs to file:-URIs */
+ if (src_scheme == THUNAR_VFS_PATH_SCHEME_TRASH && dst_scheme == THUNAR_VFS_PATH_SCHEME_FILE)
+ {
+ /* resolve the local path to the trash resource */
+ absolute_path = _thunar_vfs_io_trash_path_resolve (src_path, error);
+ if (G_LIKELY (absolute_path != NULL))
{
- s = thunar_vfs_path_dup_string (lp->data);
- g_print ("--> %s (%d)\n", s, ((ThunarVfsPath *) lp->data)->ref_count);
- g_free (s);
+ /* generate a file:-URI path for the trash resource */
+ dst_path = thunar_vfs_path_new (absolute_path, error);
+ g_free (absolute_path);
}
+ }
+ else
+ {
+ /* cannot perform the translation */
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, g_strerror (EINVAL));
+ }
+
+ return dst_path;
+}
+
+
+
+/**
+ * _thunar_vfs_path_translate_dup_string:
+ * @src_path : the source #ThunarVfsPath.
+ * @dst_scheme : the destination #ThunarVfsPathScheme.
+ * @error : return location for errors or %NULL.
+ *
+ * Uses _thunar_vfs_path_translate() and thunar_vfs_path_dup_string()
+ * to generate the string representation of the @src_path in the
+ * @dst_scheme.
+ *
+ * The caller is responsible to free the returned string using
+ * g_free() when no longer needed.
+ *
+ * Return value: the string representation of the @src_path in the
+ * @dst_scheme, or %NULL in case of an error.
+ **/
+gchar*
+_thunar_vfs_path_translate_dup_string (ThunarVfsPath *src_path,
+ ThunarVfsPathScheme dst_scheme,
+ GError **error)
+{
+ ThunarVfsPath *dst_path;
+ gchar *dst_string;
+
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
- G_UNLOCK (debug_paths);
+ /* handle the common case first */
+ if (G_LIKELY (dst_scheme == THUNAR_VFS_PATH_SCHEME_FILE))
+ {
+ if (_thunar_vfs_path_is_local (src_path))
+ return thunar_vfs_path_dup_string (src_path);
+ else if (_thunar_vfs_path_is_trash (src_path))
+ return _thunar_vfs_io_trash_path_resolve (src_path, error);
}
-#endif
- for (n = 0; n < n_home_components; ++n)
- g_assert (home_components[n]->ref_count == 1);
+ /* translate the source path to the destination scheme */
+ dst_path = _thunar_vfs_path_translate (src_path, dst_scheme, error);
+ if (G_LIKELY (dst_path != NULL))
+ {
+ /* determine the string representation */
+ dst_string = thunar_vfs_path_dup_string (dst_path);
+ thunar_vfs_path_unref (dst_path);
+ }
+ else
+ {
+ /* we failed to translate */
+ dst_string = NULL;
+ }
- g_free (home_components);
- home_components = NULL;
- n_home_components = 0;
+ return dst_string;
}
diff --git a/thunar-vfs/thunar-vfs-path.h b/thunar-vfs/thunar-vfs-path.h
index 6343c1b491808ae398e13d0eb482793f65e69fa1..4949f257d7fc748fa971866dbe6633a4880808de 100644
--- a/thunar-vfs/thunar-vfs-path.h
+++ b/thunar-vfs/thunar-vfs-path.h
@@ -29,6 +29,28 @@
G_BEGIN_DECLS;
+/**
+ * ThunarVfsPathScheme:
+ * @THUNAR_VFS_PATH_SCHEME_FILE : path to local files.
+ * @THUNAR_VFS_PATH_SCHEME_TRASH : path to files in the trash can.
+ * @THUNAR_VFS_PATH_SCHEME_MASK : bit mask for path scheme, an
+ * implementation detail, should
+ * not be used outside ThunarVFS.
+ *
+ * The scheme, or the type, of resource a #ThunarVfsPath refers to.
+ * This currently includes local files which are accessible via
+ * standard Unix paths, and trashed files, which are accessible
+ * via trash:-URIs.
+ *
+ * Since: 0.3.3
+ **/
+typedef enum /*< skip >*/
+{
+ THUNAR_VFS_PATH_SCHEME_FILE = 0x00000000,
+ THUNAR_VFS_PATH_SCHEME_TRASH = 0x40000000,
+ THUNAR_VFS_PATH_SCHEME_MASK = 0x40000000,
+} ThunarVfsPathScheme;
+
/**
* THUNAR_VFS_PATH_MAXSTRLEN:
*
@@ -50,8 +72,25 @@ G_BEGIN_DECLS;
**/
#define THUNAR_VFS_PATH_MAXURILEN (THUNAR_VFS_PATH_MAXSTRLEN * 3 - 2)
+/**
+ * THUNAR_VFS_TYPE_PATH:
+ *
+ * Returns the type id of the #ThunarVfsPath type, which is a boxed
+ * type.
+ **/
#define THUNAR_VFS_TYPE_PATH (thunar_vfs_path_get_type ())
+/**
+ * THUNAR_VFS_TYPE_PATH_LIST:
+ *
+ * Returns the type id for #GList<!---->s of #ThunarVfsPath<!---->s,
+ * which is a boxed type.
+ *
+ * Since: 0.3.3
+ **/
+#define THUNAR_VFS_TYPE_PATH_LIST (thunar_vfs_path_list_get_type ())
+
+#define THUNAR_VFS_PATH(obj) ((ThunarVfsPath *) (obj))
typedef struct _ThunarVfsPath ThunarVfsPath;
struct _ThunarVfsPath
{
@@ -60,54 +99,57 @@ struct _ThunarVfsPath
ThunarVfsPath *parent;
};
-GType thunar_vfs_path_get_type (void) G_GNUC_CONST;
+GType thunar_vfs_path_get_type (void) G_GNUC_CONST;
+GType thunar_vfs_path_list_get_type (void) G_GNUC_CONST;
-ThunarVfsPath *thunar_vfs_path_new (const gchar *identifier,
- GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+ThunarVfsPath *thunar_vfs_path_new (const gchar *identifier,
+ GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-ThunarVfsPath *thunar_vfs_path_get_for_home (void) G_GNUC_WARN_UNUSED_RESULT;
-ThunarVfsPath *thunar_vfs_path_get_for_root (void) G_GNUC_WARN_UNUSED_RESULT;
+ThunarVfsPath *thunar_vfs_path_get_for_home (void) G_GNUC_WARN_UNUSED_RESULT;
+ThunarVfsPath *thunar_vfs_path_get_for_root (void) G_GNUC_WARN_UNUSED_RESULT;
+ThunarVfsPath *thunar_vfs_path_get_for_trash (void) G_GNUC_WARN_UNUSED_RESULT;
-G_INLINE_FUNC ThunarVfsPath *thunar_vfs_path_ref (ThunarVfsPath *path);
-void thunar_vfs_path_unref (ThunarVfsPath *path);
+G_INLINE_FUNC ThunarVfsPath *thunar_vfs_path_ref (ThunarVfsPath *path);
+void thunar_vfs_path_unref (ThunarVfsPath *path);
-guint thunar_vfs_path_hash (gconstpointer path_ptr);
-gboolean thunar_vfs_path_equal (gconstpointer path_ptr_a,
- gconstpointer path_ptr_b);
+guint thunar_vfs_path_hash (gconstpointer path_ptr);
+gboolean thunar_vfs_path_equal (gconstpointer path_ptr_a,
+ gconstpointer path_ptr_b);
-ThunarVfsPath *thunar_vfs_path_relative (ThunarVfsPath *parent,
- const gchar *name) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+ThunarVfsPath *thunar_vfs_path_relative (ThunarVfsPath *parent,
+ const gchar *name) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gboolean thunar_vfs_path_is_ancestor (const ThunarVfsPath *path,
- const ThunarVfsPath *ancestor);
-gboolean thunar_vfs_path_is_home (const ThunarVfsPath *path);
-G_INLINE_FUNC gboolean thunar_vfs_path_is_root (const ThunarVfsPath *path);
+gboolean thunar_vfs_path_is_ancestor (const ThunarVfsPath *path,
+ const ThunarVfsPath *ancestor);
+gboolean thunar_vfs_path_is_home (const ThunarVfsPath *path);
+G_INLINE_FUNC gboolean thunar_vfs_path_is_root (const ThunarVfsPath *path);
-G_INLINE_FUNC const gchar *thunar_vfs_path_get_name (const ThunarVfsPath *path);
-G_INLINE_FUNC ThunarVfsPath *thunar_vfs_path_get_parent (const ThunarVfsPath *path);
+G_INLINE_FUNC const gchar *thunar_vfs_path_get_name (const ThunarVfsPath *path);
+G_INLINE_FUNC ThunarVfsPath *thunar_vfs_path_get_parent (const ThunarVfsPath *path);
+G_INLINE_FUNC ThunarVfsPathScheme thunar_vfs_path_get_scheme (const ThunarVfsPath *path);
-gchar *thunar_vfs_path_dup_string (const ThunarVfsPath *path) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gssize thunar_vfs_path_to_string (const ThunarVfsPath *path,
- gchar *buffer,
- gsize bufsize,
- GError **error);
+gchar *thunar_vfs_path_dup_string (const ThunarVfsPath *path) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gssize thunar_vfs_path_to_string (const ThunarVfsPath *path,
+ gchar *buffer,
+ gsize bufsize,
+ GError **error);
-gchar *thunar_vfs_path_dup_uri (const ThunarVfsPath *path) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gssize thunar_vfs_path_to_uri (const ThunarVfsPath *path,
- gchar *buffer,
- gsize bufsize,
- GError **error);
+gchar *thunar_vfs_path_dup_uri (const ThunarVfsPath *path) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gssize thunar_vfs_path_to_uri (const ThunarVfsPath *path,
+ gchar *buffer,
+ gsize bufsize,
+ GError **error);
-GList *thunar_vfs_path_list_from_string (const gchar *uri_string,
- GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gchar *thunar_vfs_path_list_to_string (GList *path_list) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-G_INLINE_FUNC GList *thunar_vfs_path_list_append (GList *path_list,
- ThunarVfsPath *path) G_GNUC_WARN_UNUSED_RESULT;
-G_INLINE_FUNC GList *thunar_vfs_path_list_prepend (GList *path_list,
- ThunarVfsPath *path) G_GNUC_WARN_UNUSED_RESULT;
-G_INLINE_FUNC GList *thunar_vfs_path_list_copy (GList *path_list) G_GNUC_WARN_UNUSED_RESULT;
-G_INLINE_FUNC void thunar_vfs_path_list_free (GList *path_list);
+GList *thunar_vfs_path_list_from_string (const gchar *uri_string,
+ GError **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar *thunar_vfs_path_list_to_string (GList *path_list) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+G_INLINE_FUNC GList *thunar_vfs_path_list_append (GList *path_list,
+ ThunarVfsPath *path) G_GNUC_WARN_UNUSED_RESULT;
+G_INLINE_FUNC GList *thunar_vfs_path_list_prepend (GList *path_list,
+ ThunarVfsPath *path) G_GNUC_WARN_UNUSED_RESULT;
+GList *thunar_vfs_path_list_copy (GList *path_list) G_GNUC_WARN_UNUSED_RESULT;
+void thunar_vfs_path_list_free (GList *path_list);
/* inline function implementations */
@@ -178,6 +220,23 @@ thunar_vfs_path_get_parent (const ThunarVfsPath *path)
return path->parent;
}
+/**
+ * thunar_vfs_path_get_scheme:
+ * @path : a #ThunarVfsPath.
+ *
+ * Returns the #ThunarVfsPathScheme of the specified
+ * @path.
+ *
+ * Return value: the scheme of the @path.
+ *
+ * Since: 0.3.3
+ **/
+G_INLINE_FUNC ThunarVfsPathScheme
+thunar_vfs_path_get_scheme (const ThunarVfsPath *path)
+{
+ return (path->ref_count & THUNAR_VFS_PATH_SCHEME_MASK);
+}
+
/**
* thunar_vfs_path_list_append:
* @path_list : a list of #ThunarVfsPath<!---->s.
@@ -213,55 +272,8 @@ thunar_vfs_path_list_prepend (GList *path_list,
thunar_vfs_path_ref (path);
return g_list_prepend (path_list, path);
}
-
-/**
- * thunar_vfs_path_list_copy:
- * @path_list : a list of #ThunarVfsPath<!---->s.
- *
- * Takes a deep copy of @path_list and returns the
- * result. The caller is responsible to free the
- * returned list using thunar_vfs_path_list_free().
- *
- * Return value: a deep copy of @path_list.
- **/
-G_INLINE_FUNC GList*
-thunar_vfs_path_list_copy (GList *path_list)
-{
- GList *list;
- GList *lp;
-
- for (list = NULL, lp = g_list_last (path_list); lp != NULL; lp = lp->prev)
- {
- list = g_list_prepend (list, lp->data);
- thunar_vfs_path_ref (lp->data);
- }
-
- return list;
-}
-
-/**
- * thunar_vfs_path_list_free:
- * @path_list : a list of #ThunarVfsPath<!---->s.
- *
- * Frees the #ThunarVfsPath<!---->s in @path_list and
- * the @path_list itself.
- **/
-G_INLINE_FUNC void
-thunar_vfs_path_list_free (GList *path_list)
-{
- GList *lp;
- for (lp = path_list; lp != NULL; lp = lp->next)
- thunar_vfs_path_unref (lp->data);
- g_list_free (path_list);
-}
#endif /* G_CAN_INLINE || __THUNAR_VFS_PATH_C__ */
-
-#if defined(THUNAR_VFS_COMPILATION)
-void _thunar_vfs_path_init (void) G_GNUC_INTERNAL;
-void _thunar_vfs_path_shutdown (void) G_GNUC_INTERNAL;
-#endif
-
G_END_DECLS;
#endif /* !__THUNAR_VFS_PATH_H__ */
diff --git a/thunar-vfs/thunar-vfs-private.c b/thunar-vfs/thunar-vfs-private.c
index 27483d92c0d34733120cc7f1260cbba9e8b57a7c..ab9db0b6550c8c32f93848f48cf8965dfd52bb22 100644
--- a/thunar-vfs/thunar-vfs-private.c
+++ b/thunar-vfs/thunar-vfs-private.c
@@ -22,6 +22,21 @@
#include <config.h>
#endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-monitor.h>
+#include <thunar-vfs/thunar-vfs-path-private.h>
#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
@@ -73,5 +88,216 @@ _thunar_vfs_g_type_register_simple (GType type_parent,
+/**
+ * _thunar_vfs_g_value_array_free:
+ * @values : an array of #GValue<!---->s.
+ * @n_values : the number of #GValue<!---->s in @values.
+ *
+ * Calls g_value_unset() for all items in @values and frees
+ * the @values using g_free().
+ **/
+void
+_thunar_vfs_g_value_array_free (GValue *values,
+ guint n_values)
+{
+ _thunar_vfs_return_if_fail (values != NULL);
+
+ while (n_values-- > 0)
+ g_value_unset (values + n_values);
+ g_free (values);
+}
+
+
+
+/**
+ * _thunar_vfs_check_only_local:
+ * @path_list : a #GList of #ThunarVfsPath<!---->s.
+ * @error : return location for errors or %NULL.
+ *
+ * Verifies that all #ThunarVfsPath<!---->s in the @path_list are
+ * local paths with scheme %THUNAR_VFS_PATH_SCHEME_FILE. If the
+ * check fails, @error will be initialized to an #GError with
+ * %G_FILE_ERROR_INVAL and %FALSE will be returned.
+ *
+ * Return value: %TRUE if the check succeeds, %FALSE otherwise.
+ **/
+gboolean
+_thunar_vfs_check_only_local (GList *path_list,
+ GError **error)
+{
+ GList *lp;
+
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* check all paths in the path_list */
+ for (lp = path_list; lp != NULL; lp = lp->next)
+ if (!_thunar_vfs_path_is_local (lp->data))
+ break;
+
+ /* check if any path failed the check */
+ if (G_UNLIKELY (lp != NULL))
+ {
+ _thunar_vfs_set_g_error_from_errno (error, EINVAL);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+
+/**
+ * _thunar_vfs_set_g_error_from_errno:
+ * @error : pointer to a #GError to set, or %NULL.
+ * @serrno : the errno value to set the @error to.
+ *
+ * If @error is not %NULL it will be initialized to the errno
+ * value in @serrno.
+ **/
+void
+_thunar_vfs_set_g_error_from_errno (GError **error,
+ gint serrno)
+{
+ /* allocate a GError for the specified errno value */
+ g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (serrno), g_strerror (serrno));
+}
+
+
+
+/**
+ * _thunar_vfs_set_g_error_from_errno2:
+ * @error : pointer to a #GError to set, or %NULL.
+ * @serrno : the errno value to set the @error to.
+ * @format : a printf(3)-style format string.
+ * @... : arguments for the @format string.
+ *
+ * Similar to _thunar_vfs_set_g_error_from_errno(), but
+ * allows to specify an additional string for the error
+ * message text.
+ **/
+void
+_thunar_vfs_set_g_error_from_errno2 (GError **error,
+ gint serrno,
+ const gchar *format,
+ ...)
+{
+ va_list var_args;
+ gchar *message;
+
+ /* allocate a GError for the specified errno value */
+ va_start (var_args, format);
+ message = g_strdup_vprintf (format, var_args);
+ g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (serrno),
+ "%s: %s", message, g_strerror (serrno));
+ va_end (var_args);
+ g_free (message);
+}
+
+
+
+static inline gint
+unescape_character (const gchar *s)
+{
+ gint first_digit;
+ gint second_digit;
+
+ first_digit = g_ascii_xdigit_value (s[0]);
+ if (first_digit < 0)
+ return -1;
+
+ second_digit = g_ascii_xdigit_value (s[1]);
+ if (second_digit < 0)
+ return -1;
+
+ return (first_digit << 4) | second_digit;
+}
+
+
+
+/**
+ * _thunar_vfs_unescape_rfc2396_string:
+ * @escaped_string : the escaped string.
+ * @escaped_len : the length of @escaped_string or %-1.
+ * @illegal_escaped_characters : the characters that may not appear escaped
+ * in @escaped_string.
+ * @ascii_must_not_be_escaped : %TRUE to disallow escaped ASCII characters.
+ * @error : return location for errors or %NULL.
+ *
+ * Unescapes the @escaped_string according to RFC 2396.
+ *
+ * Return value: the unescaped string or %NULL in case of an error.
+ **/
+gchar*
+_thunar_vfs_unescape_rfc2396_string (const gchar *escaped_string,
+ gssize escaped_len,
+ const gchar *illegal_escaped_characters,
+ gboolean ascii_must_not_be_escaped,
+ GError **error)
+{
+ const gchar *s;
+ gchar *unescaped_string;
+ gchar *t;
+ gint c;
+
+ _thunar_vfs_return_val_if_fail (illegal_escaped_characters != NULL, NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* verify that we have a valid string */
+ if (G_UNLIKELY (escaped_string == NULL))
+ return NULL;
+
+ /* determine the length on-demand */
+ if (G_UNLIKELY (escaped_len < 0))
+ escaped_len = strlen (escaped_string);
+
+ /* proces the escaped string */
+ unescaped_string = g_malloc (escaped_len + 1);
+ for (s = escaped_string, t = unescaped_string;; ++s)
+ {
+ /* determine the next character */
+ c = *s;
+ if (c == '\0')
+ break;
+
+ /* handle escaped characters */
+ if (G_UNLIKELY (c == '%'))
+ {
+ /* catch partial escape sequence past the end of the substring */
+ if (s[1] == '\0' || s[2] == '\0')
+ goto error;
+
+ /* unescape the character */
+ c = unescape_character (s + 1);
+
+ /* catch bad escape sequences and NUL characters */
+ if (c <= 0)
+ goto error;
+
+ /* catch escaped ASCII */
+ if (ascii_must_not_be_escaped && c > 0x1f && c <= 0x7f)
+ goto error;
+
+ /* catch other illegal escaped characters */
+ if (strchr (illegal_escaped_characters, c) != NULL)
+ goto error;
+
+ s += 2;
+ }
+
+ *t++ = c;
+ }
+ *t = '\0';
+
+ return unescaped_string;
+
+error:
+ /* TRANSLATORS: This error indicates that an URI contains an invalid escaped character (RFC 2396) */
+ g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_BAD_URI, _("Invalidly escaped characters"));
+ g_free (unescaped_string);
+ return NULL;
+}
+
+
+
#define __THUNAR_VFS_PRIVATE_C__
#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-private.h b/thunar-vfs/thunar-vfs-private.h
index 045e504ede98abfa43e60df5a3c00e1a9b39214a..1d33b3b7f81ae7cc80cdcde28cc8e0f4103865d7 100644
--- a/thunar-vfs/thunar-vfs-private.h
+++ b/thunar-vfs/thunar-vfs-private.h
@@ -18,24 +18,100 @@
* Boston, MA 02111-1307, USA.
*/
-#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
-#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
#endif
#ifndef __THUNAR_VFS_PRIVATE_H__
#define __THUNAR_VFS_PRIVATE_H__
-#include <exo/exo.h>
+#include <thunar-vfs/thunar-vfs-config.h>
G_BEGIN_DECLS;
-GType _thunar_vfs_g_type_register_simple (GType type_parent,
- const gchar *type_name_static,
- guint class_size,
- gpointer class_init,
- guint instance_size,
- gpointer instance_init,
- GTypeFlags flags) G_GNUC_INTERNAL;
+/* support macros for debugging */
+#ifdef G_ENABLE_DEBUG
+#define _thunar_vfs_assert(expr) g_assert (expr)
+#define _thunar_vfs_assert_not_reached() g_assert_not_reached ()
+#define _thunar_vfs_return_if_fail(expr) g_return_if_fail (expr)
+#define _thunar_vfs_return_val_if_fail(expr, val) g_return_val_if_fail (expr, (val))
+#else
+#define _thunar_vfs_assert(expr) G_STMT_START{ (void)0; }G_STMT_END
+#define _thunar_vfs_assert_not_reached() G_STMT_START{ (void)0; }G_STMT_END
+#define _thunar_vfs_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END
+#define _thunar_vfs_return_val_if_fail(expr, val) G_STMT_START{ (void)0; }G_STMT_END
+#endif
+
+/* support macros for the slice allocator */
+#if GLIB_CHECK_VERSION(2,10,0)
+#define _thunar_vfs_slice_alloc(block_size) (g_slice_alloc ((block_size)))
+#define _thunar_vfs_slice_alloc0(block_size) (g_slice_alloc0 ((block_size)))
+#define _thunar_vfs_slice_free1(block_size, mem_block) G_STMT_START{ g_slice_free1 ((block_size), (mem_block)); }G_STMT_END
+#define _thunar_vfs_slice_new(type) (g_slice_new (type))
+#define _thunar_vfs_slice_new0(type) (g_slice_new0 (type))
+#define _thunar_vfs_slice_free(type, ptr) G_STMT_START{ g_slice_free (type, (ptr)); }G_STMT_END
+#else
+#define _thunar_vfs_slice_alloc(block_size) (g_malloc ((block_size)))
+#define _thunar_vfs_slice_alloc0(block_size) (g_malloc0 ((block_size)))
+#define _thunar_vfs_slice_free1(block_size, mem_block) G_STMT_START{ g_free ((mem_block)); }G_STMT_END
+#define _thunar_vfs_slice_new(type) (g_new (type, 1))
+#define _thunar_vfs_slice_new0(type) (g_new0 (type, 1))
+#define _thunar_vfs_slice_free(type, ptr) G_STMT_START{ g_free ((ptr)); }G_STMT_END
+#endif
+
+/* avoid trivial g_value_get_*() function calls */
+#ifndef G_ENABLE_DEBUG
+#define g_value_get_boolean(v) (((const GValue *) (v))->data[0].v_int)
+#define g_value_get_char(v) (((const GValue *) (v))->data[0].v_int)
+#define g_value_get_uchar(v) (((const GValue *) (v))->data[0].v_uint)
+#define g_value_get_int(v) (((const GValue *) (v))->data[0].v_int)
+#define g_value_get_uint(v) (((const GValue *) (v))->data[0].v_uint)
+#define g_value_get_long(v) (((const GValue *) (v))->data[0].v_long)
+#define g_value_get_ulong(v) (((const GValue *) (v))->data[0].v_ulong)
+#define g_value_get_int64(v) (((const GValue *) (v))->data[0].v_int64)
+#define g_value_get_uint64(v) (((const GValue *) (v))->data[0].v_uint64)
+#define g_value_get_enum(v) (((const GValue *) (v))->data[0].v_long)
+#define g_value_get_flags(v) (((const GValue *) (v))->data[0].v_ulong)
+#define g_value_get_float(v) (((const GValue *) (v))->data[0].v_float)
+#define g_value_get_double(v) (((const GValue *) (v))->data[0].v_double)
+#define g_value_get_string(v) (((const GValue *) (v))->data[0].v_pointer)
+#define g_value_get_param(v) (((const GValue *) (v))->data[0].v_pointer)
+#define g_value_get_boxed(v) (((const GValue *) (v))->data[0].v_pointer)
+#define g_value_get_pointer(v) (((const GValue *) (v))->data[0].v_pointer)
+#define g_value_get_object(v) (((const GValue *) (v))->data[0].v_pointer)
+#endif
+
+/* GType registration routines */
+GType _thunar_vfs_g_type_register_simple (GType type_parent,
+ const gchar *type_name_static,
+ guint class_size,
+ gpointer class_init,
+ guint instance_size,
+ gpointer instance_init,
+ GTypeFlags flags) G_GNUC_INTERNAL;
+
+/* GType value routines */
+void _thunar_vfs_g_value_array_free (GValue *values,
+ guint n_values) G_GNUC_INTERNAL;
+
+/* path scheme checking routines */
+gboolean _thunar_vfs_check_only_local (GList *path_list,
+ GError **error) G_GNUC_INTERNAL;
+
+/* error reporting routines */
+void _thunar_vfs_set_g_error_from_errno (GError **error,
+ gint serrno) G_GNUC_INTERNAL;
+void _thunar_vfs_set_g_error_from_errno2 (GError **error,
+ gint serrno,
+ const gchar *format,
+ ...) G_GNUC_INTERNAL G_GNUC_PRINTF (3, 4);
+
+/* RFC 2396 support routines */
+gchar *_thunar_vfs_unescape_rfc2396_string (const gchar *escaped_string,
+ gssize escaped_len,
+ const gchar *illegal_escaped_characters,
+ gboolean ascii_must_not_be_escaped,
+ GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
G_END_DECLS;
diff --git a/thunar-vfs/thunar-vfs-scandir.c b/thunar-vfs/thunar-vfs-scandir.c
deleted file mode 100644
index c20a7e1c9e2ebc7a6f296512b7e21a6d9f9efb50..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-scandir.c
+++ /dev/null
@@ -1,490 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <thunar-vfs/thunar-vfs-scandir.h>
-#include <thunar-vfs/thunar-vfs-alias.h>
-
-/* Use g_access() on win32 */
-#if GLIB_CHECK_VERSION(2,8,0) && defined(G_OS_WIN32)
-#include <glib/gstdio.h>
-#else
-#define g_access(path, mode) (access ((path), (mode)))
-#endif
-
-
-
-/* %&§$!# IRIX and Solaris */
-#if defined(__sgi__) && !defined(dirfd)
-#define dirfd(dp) (((DIR *) (dp))->__dd_fd)
-#elif defined(__sun__) && !defined(dirfd)
-#define dirfd(dp) (((DIR *) (dp))->dd_fd)
-#endif
-
-
-
-typedef struct _ThunarVfsScandirHandle ThunarVfsScandirHandle;
-
-
-
-#ifdef __FreeBSD__
-static gboolean thunar_vfs_scandir_collect_fast (ThunarVfsScandirHandle *handle,
- ThunarVfsPath *path,
- GList **directoriesp);
-#endif
-static gboolean thunar_vfs_scandir_collect_slow (ThunarVfsScandirHandle *handle,
- ThunarVfsPath *path,
- GList **directoriesp);
-static gboolean thunar_vfs_scandir_collect (ThunarVfsScandirHandle *handle,
- volatile gboolean *cancelled,
- ThunarVfsPath *path);
-
-
-
-struct _ThunarVfsScandirHandle
-{
- ThunarVfsScandirFlags flags;
- GCompareFunc func;
- GList *path_list;
- gchar fname[THUNAR_VFS_PATH_MAXSTRLEN];
-};
-
-
-
-#ifdef __FreeBSD__
-static gboolean
-thunar_vfs_scandir_collect_fast (ThunarVfsScandirHandle *handle,
- ThunarVfsPath *path,
- GList **directoriesp)
-{
-#define statfsp ((struct statfs *) (dbuf))
-
- ThunarVfsPath *child;
- struct dirent *dp;
- struct stat statb;
- gboolean succeed = FALSE;
- gchar *dbuf;
- guint dlen;
- glong base;
- gint sverrno;
- gint size;
- gint loc;
- gint fd;
- gint n;
-
- /* try to open the file (the file name is placed in handle->fname) */
- fd = open (handle->fname, O_RDONLY | ((handle->flags & THUNAR_VFS_SCANDIR_FOLLOW_LINKS) ? 0 : O_NOFOLLOW));
- if (G_UNLIKELY (fd < 0))
- {
- /* translate EMLINK to ENOTDIR */
- if (G_UNLIKELY (errno == EMLINK))
- errno = ENOTDIR;
- return FALSE;
- }
-
- /* stat the file */
- if (fstat (fd, &statb) < 0)
- goto done;
-
- /* verify that we have a directory here */
- if (!S_ISDIR (statb.st_mode))
- {
- errno = ENOTDIR;
- goto done;
- }
-
- /* verify that we can enter the directory (else
- * we won't get any useful infos about the dir
- * contents either, so no need to continue). See
- * http://bugzilla.xfce.org/show_bug.cgi?id=1408.
- */
- if ((statb.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != (S_IXUSR | S_IXGRP | S_IXOTH) && (g_access (handle->fname, X_OK) < 0))
- {
- errno = EACCES;
- goto done;
- }
-
- /* calculate the directory buffer size */
- dlen = statb.st_blksize * 8;
- if (G_UNLIKELY ((dlen % DIRBLKSIZ) != 0))
- dlen = ((dlen + DIRBLKSIZ - 1) / DIRBLKSIZ) * DIRBLKSIZ;
- if (G_UNLIKELY (dlen < sizeof (struct statfs)))
- dlen = sizeof (struct statfs);
-
- /* allocate the directory buffer, which is
- * also used to store the statfs(2) results.
- */
- dbuf = alloca (dlen);
-
- /* determine the file system details */
- if (fstatfs (fd, statfsp) < 0)
- goto done;
-
- /* check if we have a unionfs here, which requires special processing (not provided by the fast collector) */
- if (memcmp (statfsp->f_fstypename, "unionfs", 8) == 0 || (statfsp->f_flags & MNT_UNION) != 0)
- {
- /* fallback to the slower collector */
- succeed = thunar_vfs_scandir_collect_slow (handle, path, directoriesp);
- }
- else
- {
- /* read the directory content */
- for (base = loc = size = 0;;)
- {
- /* check if we need to fill the buffer again */
- if (loc >= size)
- {
- /* read the next chunk */
- size = getdirentries (fd, dbuf, dlen, &base);
- if (size <= 0)
- break;
- loc = 0;
- }
-
- /* grab the pointer to the next entry */
- dp = (struct dirent *) (dbuf + loc);
- if (G_UNLIKELY (((gulong) dp & 0x03) != 0))
- break;
-
- /* verify the next record length */
- if (G_UNLIKELY (dp->d_reclen <= 0 || dp->d_reclen > dlen + 1 - loc))
- break;
-
- /* adjust the location pointer */
- loc += dp->d_reclen;
-
- /* verify the inode and type */
- if (G_UNLIKELY (dp->d_ino == 0 || dp->d_type == DT_WHT))
- continue;
-
- /* ignore '.' and '..' entries */
- if (G_UNLIKELY (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))))
- continue;
-
- /* add the child path to the path list */
- child = thunar_vfs_path_relative (path, dp->d_name);
- if (handle->func != NULL)
- handle->path_list = g_list_insert_sorted (handle->path_list, child, handle->func);
- else
- handle->path_list = g_list_prepend (handle->path_list, child);
-
- /* check if we want to collect children for recursive scanning */
- if (G_UNLIKELY (directoriesp != NULL))
- {
- /* DT_UNKNOWN must be handled for certain file systems */
- if (G_UNLIKELY (dp->d_type == DT_UNKNOWN))
- {
- /* determine the absolute path to the child */
- if (!thunar_vfs_path_to_string (child, handle->fname, sizeof (handle->fname), NULL) < 0)
- {
- errno = ENAMETOOLONG;
- goto done;
- }
-
- /* stat the child (according to the FOLLOW_LINKS policy) */
- n = ((handle->flags & THUNAR_VFS_SCANDIR_FOLLOW_LINKS) == 0)
- ? lstat (handle->fname, &statb) : stat (handle->fname, &statb);
-
- /* check if we have a directory here */
- if (n == 0 && S_ISDIR (statb.st_mode))
- dp->d_type = DT_DIR;
- }
-
- /* check if we have a directory */
- if (dp->d_type == DT_DIR)
- *directoriesp = g_list_prepend (*directoriesp, child);
- }
- }
-
- succeed = TRUE;
- }
-
-done:
- sverrno = errno;
- close (fd);
- errno = sverrno;
- return succeed;
-
-#undef statfsp
-}
-#endif
-
-
-
-static gboolean
-thunar_vfs_scandir_collect_slow (ThunarVfsScandirHandle *handle,
- ThunarVfsPath *path,
- GList **directoriesp)
-{
- ThunarVfsPath *child;
- struct dirent dbuf;
- struct dirent *dp;
- struct stat fstatb;
- gint sverrno;
- gint n;
- DIR *dirp;
-
- /* try to open the directory (handle->buffer still
- * contains the absolute path when we get here!).
- */
- dirp = opendir (handle->fname);
- if (G_UNLIKELY (dirp == NULL))
- return FALSE;
-
- /* stat the just opened directory */
- if (fstat (dirfd (dirp), &fstatb) < 0)
- goto error;
-
- /* verify that the directory is really the directory we want
- * to open. If not, we've probably detected a race condition,
- * so we'll better stop rather than doing anything stupid
- * (remember, this method is also used in collecting
- * files for the unlink job!!). Better safe than sorry!
- */
- if (G_UNLIKELY ((handle->flags & THUNAR_VFS_SCANDIR_FOLLOW_LINKS) == 0))
- {
- struct stat lstatb;
-
- /* stat the path (without following links) */
- if (lstat (handle->fname, &lstatb) < 0)
- goto error;
-
- /* check that we have the same file here */
- if (fstatb.st_ino != lstatb.st_ino || fstatb.st_dev != lstatb.st_dev)
- {
- errno = ENOTDIR;
- goto error;
- }
- }
-
- /* verify that we can enter the directory (else
- * we won't get any useful infos about the dir
- * contents either, so no need to continue). See
- * http://bugzilla.xfce.org/show_bug.cgi?id=1408.
- */
- if ((fstatb.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != (S_IXUSR | S_IXGRP | S_IXOTH) && (g_access (handle->fname, X_OK) < 0))
- {
- errno = EACCES;
- goto error;
- }
-
- /* read the directory content */
- for (;;)
- {
- /* read the next directory entry */
- if (readdir_r (dirp, &dbuf, &dp) < 0 || dp == NULL)
- break;
-
- /* ignore '.' and '..' entries */
- if (G_UNLIKELY (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))))
- continue;
-
- /* add the child path to the path list */
- child = thunar_vfs_path_relative (path, dp->d_name);
- if (handle->func != NULL)
- handle->path_list = g_list_insert_sorted (handle->path_list, child, handle->func);
- else
- handle->path_list = g_list_prepend (handle->path_list, child);
-
- /* check if we want to collect children for recursive scanning */
- if (G_UNLIKELY (directoriesp != NULL))
- {
- struct stat statb;
-
- /* determine the absolute path to the child */
- if (thunar_vfs_path_to_string (child, handle->fname, sizeof (handle->fname), NULL) < 0)
- {
- errno = ENAMETOOLONG;
- goto error;
- }
-
- /* stat the child (according to the FOLLOW_LINKS policy) */
- n = ((handle->flags & THUNAR_VFS_SCANDIR_FOLLOW_LINKS) == 0)
- ? lstat (handle->fname, &statb) : stat (handle->fname, &statb);
-
- /* check if we have a directory here */
- if (n == 0 && S_ISDIR (statb.st_mode))
- *directoriesp = g_list_prepend (*directoriesp, child);
- }
- }
-
- closedir (dirp);
- return TRUE;
-
-error:
- sverrno = errno;
- closedir (dirp);
- errno = sverrno;
- return FALSE;
-}
-
-
-
-static gboolean
-thunar_vfs_scandir_collect (ThunarVfsScandirHandle *handle,
- volatile gboolean *cancelled,
- ThunarVfsPath *path)
-{
- gboolean succeed = FALSE;
- GList *directories = NULL;
- GList *lp;
- gint sverrno;
-
- /* determine the absolute path */
- if (thunar_vfs_path_to_string (path, handle->fname, sizeof (handle->fname), NULL) < 0)
- {
- errno = ENAMETOOLONG;
- return FALSE;
- }
-
-#ifdef __FreeBSD__
- /* We can some nice things in FreeBSD */
- succeed = thunar_vfs_scandir_collect_fast (handle, path, (handle->flags & THUNAR_VFS_SCANDIR_RECURSIVE) ? &directories : NULL);
-#else
- /* use the generic (slower) collector */
- succeed = thunar_vfs_scandir_collect_slow (handle, path, (handle->flags & THUNAR_VFS_SCANDIR_RECURSIVE) ? &directories : NULL);
-#endif
-
- /* check if we want to recurse */
- if (G_UNLIKELY (directories != NULL))
- {
- /* perform the recursion */
- for (lp = directories; lp != NULL && succeed; lp = lp->next)
- {
- /* check if the user cancelled the scanning */
- if (G_UNLIKELY (cancelled != NULL && *cancelled))
- {
- succeed = FALSE;
- errno = EINTR;
- break;
- }
-
- /* collect the files for this directory */
- succeed = thunar_vfs_scandir_collect (handle, cancelled, lp->data);
- if (G_UNLIKELY (!succeed))
- {
- /* we can ignore certain errors here */
- if (errno == EACCES || errno == EMLINK || errno == ENOTDIR || errno == ENOENT || errno == EPERM)
- succeed = TRUE;
- }
- }
-
- /* release the directory list */
- sverrno = errno;
- g_list_free (directories);
- errno = sverrno;
- }
-
- return succeed;
-}
-
-
-
-/**
- * thunar_vfs_scandir:
- * @path
- * @cancelled : pointer to a volatile boolean variable, which if
- * %TRUE means to cancel the scan operation. May be
- * %NULL in which case the scanner cannot be
- * cancelled.
- * @flags
- * @func
- * @error : return location for errors or %NULL.
- *
- * The caller is responsible to free the returned list
- * using thunar_vfs_path_list_free() when no longer
- * needed.
- *
- * If @cancelled becomes true during the scan operation, %NULL
- * will be returned and @error will be set to %G_FILE_ERROR_INTR.
- *
- * Return value:
- **/
-GList*
-thunar_vfs_scandir (ThunarVfsPath *path,
- volatile gboolean *cancelled,
- ThunarVfsScandirFlags flags,
- GCompareFunc func,
- GError **error)
-{
- ThunarVfsScandirHandle handle;
-
- g_return_val_if_fail (path != NULL, FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
- /* initialize the scandir handle */
- handle.flags = flags;
- handle.func = func;
- handle.path_list = NULL;
-
- /* collect the paths */
- if (!thunar_vfs_scandir_collect (&handle, cancelled, path))
- {
- /* forward the error */
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), g_strerror (errno));
- thunar_vfs_path_list_free (handle.path_list);
- return NULL;
- }
-
- return handle.path_list;
-}
-
-
-
-#define __THUNAR_VFS_SCANDIR_C__
-#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-simple-job.c b/thunar-vfs/thunar-vfs-simple-job.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba1cd8f3b0b043222428e2df22e8879926539dcb
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-simple-job.c
@@ -0,0 +1,203 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-interactive-job.h>
+#include <thunar-vfs/thunar-vfs-private.h>
+#include <thunar-vfs/thunar-vfs-simple-job.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+#include <gobject/gvaluecollector.h>
+
+
+
+static void thunar_vfs_simple_job_class_init (ThunarVfsSimpleJobClass *klass);
+static void thunar_vfs_simple_job_finalize (GObject *object);
+static void thunar_vfs_simple_job_execute (ThunarVfsJob *job);
+
+
+
+struct _ThunarVfsSimpleJobClass
+{
+ ThunarVfsInteractiveJobClass __parent__;
+};
+
+struct _ThunarVfsSimpleJob
+{
+ ThunarVfsInteractiveJob __parent__;
+ ThunarVfsSimpleJobFunc func;
+ GValue *param_values;
+ guint n_param_values;
+};
+
+
+
+static GObjectClass *thunar_vfs_simple_job_parent_class;
+
+
+
+GType
+thunar_vfs_simple_job_get_type (void)
+{
+ static GType type = G_TYPE_INVALID;
+
+ if (G_UNLIKELY (type == G_TYPE_INVALID))
+ {
+ type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_INTERACTIVE_JOB,
+ "ThunarVfsSimpleJob",
+ sizeof (ThunarVfsSimpleJobClass),
+ thunar_vfs_simple_job_class_init,
+ sizeof (ThunarVfsSimpleJob),
+ NULL, 0);
+ }
+
+ return type;
+}
+
+
+
+static void
+thunar_vfs_simple_job_class_init (ThunarVfsSimpleJobClass *klass)
+{
+ ThunarVfsJobClass *thunarvfs_job_class;
+ GObjectClass *gobject_class;
+
+ /* determine the parent type class */
+ thunar_vfs_simple_job_parent_class = g_type_class_peek_parent (klass);
+
+ gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class->finalize = thunar_vfs_simple_job_finalize;
+
+ thunarvfs_job_class = THUNAR_VFS_JOB_CLASS (klass);
+ thunarvfs_job_class->execute = thunar_vfs_simple_job_execute;
+}
+
+
+
+static void
+thunar_vfs_simple_job_finalize (GObject *object)
+{
+ ThunarVfsSimpleJob *simple_job = THUNAR_VFS_SIMPLE_JOB (object);
+
+ /* release the param values */
+ _thunar_vfs_g_value_array_free (simple_job->param_values, simple_job->n_param_values);
+
+ (*G_OBJECT_CLASS (thunar_vfs_simple_job_parent_class)->finalize) (object);
+}
+
+
+
+static void
+thunar_vfs_simple_job_execute (ThunarVfsJob *job)
+{
+ ThunarVfsSimpleJob *simple_job = THUNAR_VFS_SIMPLE_JOB (job);
+ GError *error = NULL;
+
+ /* try to execute the job using the supplied function */
+ if (!(*simple_job->func) (job, simple_job->param_values, simple_job->n_param_values, &error))
+ {
+ /* forward the error to the client */
+ _thunar_vfs_job_error (job, error);
+ g_error_free (error);
+ }
+}
+
+
+
+/**
+ * thunar_vfs_simple_job_launch:
+ * @func : the #ThunarVfsSimpleJobFunc to execute the job.
+ * @n_param_values : the number of parameters to pass to the @func.
+ * @... : a list of #GType and parameter pairs (exactly
+ * @n_param_values pairs) that are passed to @func.
+ *
+ * Allocates a new #ThunarVfsSimpleJob, which executes the specified
+ * @func with the specified parameters.
+ *
+ * For example the listdir @func expects a #ThunarVfsPath for the
+ * folder to list, so the call to thunar_vfs_simple_job_launch()
+ * would look like this:
+ *
+ * <informalexample><programlisting>
+ * thunar_vfs_simple_job_launch (_thunar_vfs_io_jobs_listdir, 1,
+ * THUNAR_VFS_TYPE_PATH, path);
+ * </programlisting></informalexample>
+ *
+ * The caller is responsible to release the returned object using
+ * thunar_vfs_job_unref() when no longer needed.
+ *
+ * Return value: the launched #ThunarVfsJob.
+ **/
+ThunarVfsJob*
+thunar_vfs_simple_job_launch (ThunarVfsSimpleJobFunc func,
+ guint n_param_values,
+ ...)
+{
+ ThunarVfsSimpleJob *simple_job;
+ va_list var_args;
+ GValue *value;
+ gchar *error_message;
+
+ /* allocate and initialize the simple job */
+ simple_job = g_object_new (THUNAR_VFS_TYPE_SIMPLE_JOB, NULL);
+ simple_job->func = func;
+ simple_job->param_values = g_new0 (GValue, n_param_values);
+ simple_job->n_param_values = n_param_values;
+
+ /* collect the parameters */
+ va_start (var_args, n_param_values);
+ for (value = simple_job->param_values; value < simple_job->param_values + n_param_values; ++value)
+ {
+ /* initialize the value to hold the next parameter */
+ g_value_init (value, va_arg (var_args, GType));
+
+ /* collect the value from the stack */
+ G_VALUE_COLLECT (value, var_args, 0, &error_message);
+
+ /* check if an error occurred */
+ if (G_UNLIKELY (error_message != NULL))
+ {
+ g_error ("%s: %s", G_STRLOC, error_message);
+ g_free (error_message);
+ }
+ }
+ va_end (var_args);
+
+ /* launch the job */
+ return thunar_vfs_job_launch (THUNAR_VFS_JOB (simple_job));
+}
+
+
+
+#define __THUNAR_VFS_SIMPLE_JOB_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-simple-job.h b/thunar-vfs/thunar-vfs-simple-job.h
new file mode 100644
index 0000000000000000000000000000000000000000..a33b712966015fc5895724778802a9d82405509e
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-simple-job.h
@@ -0,0 +1,67 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_SIMPLE_JOB_H__
+#define __THUNAR_VFS_SIMPLE_JOB_H__
+
+#include <thunar-vfs/thunar-vfs-job-private.h>
+
+G_BEGIN_DECLS;
+
+/**
+ * ThunarVfsSimpleJobFunc:
+ * @job : a #ThunarVfsJob.
+ * @param_values : the #GValue<!---->s passed to thunar_vfs_simple_job_launch().
+ * @n_param_values : the number of #GValue<!---->s passed in @param_values.
+ * @error : return location for errors.
+ *
+ * Used by the #ThunarVfsSimpleJob to process the @job. See thunar_vfs_simple_job_launch()
+ * for further details.
+ *
+ * Return value: %TRUE on success, %FALSE in case of an error.
+ **/
+typedef gboolean (*ThunarVfsSimpleJobFunc) (ThunarVfsJob *job,
+ const GValue *param_values,
+ guint n_param_values,
+ GError **error);
+
+typedef struct _ThunarVfsSimpleJobClass ThunarVfsSimpleJobClass;
+typedef struct _ThunarVfsSimpleJob ThunarVfsSimpleJob;
+
+#define THUNAR_VFS_TYPE_SIMPLE_JOB (thunar_vfs_simple_job_get_type ())
+#define THUNAR_VFS_SIMPLE_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_SIMPLE_JOB, ThunarVfsSimpleJob))
+#define THUNAR_VFS_SIMPLE_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_SIMPLE_JOB, ThunarVfsSimpleJobClass))
+#define THUNAR_VFS_IS_SIMPLE_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_SIMPLE_JOB))
+#define THUNAR_VFS_IS_SIMPLE_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_SIMPLE_JOB))
+#define THUNAR_VFS_SIMPLE_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_SIMPLE_JOB, ThunarVfsSimpleJobClass))
+
+GType thunar_vfs_simple_job_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+
+ThunarVfsJob *thunar_vfs_simple_job_launch (ThunarVfsSimpleJobFunc func,
+ guint n_param_values,
+ ...) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_SIMPLE_JOB_H__ */
diff --git a/thunar-vfs/thunar-vfs-thumb-jpeg.c b/thunar-vfs/thunar-vfs-thumb-jpeg.c
index 210e05983ef54c0beba571dccfcc8a2e47d025ed..23711950210fd32376e722c8caf6088410bf85fe 100644
--- a/thunar-vfs/thunar-vfs-thumb-jpeg.c
+++ b/thunar-vfs/thunar-vfs-thumb-jpeg.c
@@ -55,8 +55,6 @@
#include<jpeglib.h>
#endif
-#include <exo/exo.h>
-
#include <thunar-vfs/thunar-vfs-thumb-jpeg.h>
#include <thunar-vfs/thunar-vfs-alias.h>
diff --git a/thunar-vfs/thunar-vfs-thumb-jpeg.h b/thunar-vfs/thunar-vfs-thumb-jpeg.h
index 913796f97c8cadb997ce2705798f9b20d2334845..06d5d1034256761197a1e42d0efc700e3663c05f 100644
--- a/thunar-vfs/thunar-vfs-thumb-jpeg.h
+++ b/thunar-vfs/thunar-vfs-thumb-jpeg.h
@@ -25,8 +25,6 @@
#ifndef __THUNAR_VFS_THUMB_JPEG_H__
#define __THUNAR_VFS_THUMB_JPEG_H__
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
#include <thunar-vfs/thunar-vfs-config.h>
G_BEGIN_DECLS;
diff --git a/thunar-vfs/thunar-vfs-thumb-private.h b/thunar-vfs/thunar-vfs-thumb-private.h
new file mode 100644
index 0000000000000000000000000000000000000000..cf492511e3bd7eb69faf223c8ee837b5ec43f845
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-thumb-private.h
@@ -0,0 +1,37 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file is not part of the public API."
+#endif
+
+#ifndef __THUNAR_VFS_THUMB_PRIVATE_H__
+#define __THUNAR_VFS_THUMB_PRIVATE_H__
+
+#include <thunar-vfs/thunar-vfs-thumb.h>
+
+G_BEGIN_DECLS;
+
+/* Support routines for thumbnail cleanup */
+void _thunar_vfs_thumbnail_remove_for_path (const ThunarVfsPath *path) G_GNUC_INTERNAL;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_THUMB_PRIVATE_H__ */
diff --git a/thunar-vfs/thunar-vfs-thumb.c b/thunar-vfs/thunar-vfs-thumb.c
index 6dd930c2e196383e2b2fdaf8e8c40ae7c340bc23..446512eb9e73ab7241c82ea330efa579727faccf 100644
--- a/thunar-vfs/thunar-vfs-thumb.c
+++ b/thunar-vfs/thunar-vfs-thumb.c
@@ -56,7 +56,7 @@
#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-thumb-jpeg.h>
#include <thunar-vfs/thunar-vfs-thumb-pixbuf.h>
-#include <thunar-vfs/thunar-vfs-thumb.h>
+#include <thunar-vfs/thunar-vfs-thumb-private.h>
#include <thunar-vfs/thunar-vfs-alias.h>
#ifdef HAVE_GCONF
@@ -64,11 +64,11 @@
#endif
/* use g_rename() and g_unlink() on win32 */
-#if GLIB_CHECK_VERSION(2,6,0) && defined(G_OS_WIN32)
+#if defined(G_OS_WIN32)
#include <glib/gstdio.h>
#else
-#define g_rename(oldfilename, newfilename) (rename ((oldfilename), (newfilename)))
-#define g_unlink(filename) (unlink ((filename)))
+#define g_rename(from, to) (rename ((from), (to)))
+#define g_unlink(path) (unlink ((path)))
#endif
@@ -941,5 +941,29 @@ done0:
+/**
+ * _thunar_vfs_thumbnail_remove_for_path:
+ * @path : the #ThunarVfsPath to the file whose thumbnails should be removed.
+ *
+ * Removes any existing thumbnails for the file at the specified @path.
+ **/
+void
+_thunar_vfs_thumbnail_remove_for_path (const ThunarVfsPath *path)
+{
+ ThunarVfsThumbSize size;
+ gchar *thumbnail_path;
+
+ /* drop the normal and large thumbnails for the path */
+ for (size = THUNAR_VFS_THUMB_SIZE_NORMAL; size < THUNAR_VFS_THUMB_SIZE_LARGE; ++size)
+ {
+ /* the thumbnail may not exist, so simply ignore errors here */
+ thumbnail_path = thunar_vfs_thumbnail_for_path (path, size);
+ g_unlink (thumbnail_path);
+ g_free (thumbnail_path);
+ }
+}
+
+
+
#define __THUNAR_VFS_THUMB_C__
#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-transfer-job.c b/thunar-vfs/thunar-vfs-transfer-job.c
index 68de2fec9d5509a86f2331b26325597f317e2603..28ee1bbde791eb37112810eabf2b05b39429e924 100644
--- a/thunar-vfs/thunar-vfs-transfer-job.c
+++ b/thunar-vfs/thunar-vfs-transfer-job.c
@@ -22,77 +22,44 @@
#include <config.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <thunar-vfs/thunar-vfs-monitor.h>
-#include <thunar-vfs/thunar-vfs-scandir.h>
+#include <thunar-vfs/thunar-vfs-io-ops.h>
+#include <thunar-vfs/thunar-vfs-io-scandir.h>
+#include <thunar-vfs/thunar-vfs-job-private.h>
+#include <thunar-vfs/thunar-vfs-monitor-private.h>
#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-transfer-job.h>
-#include <thunar-vfs/thunar-vfs-xfer.h>
#include <thunar-vfs/thunar-vfs-alias.h>
-/* use g_lstat(), g_rename(), g_rmdir() and g_unlink() on win32 */
-#if GLIB_CHECK_VERSION(2,6,0) && defined(G_OS_WIN32)
-#include <glib/gstdio.h>
-#else
-#define g_lstat(path, statb) (lstat ((path), (statb)))
-#define g_rename(oldfilename, newfilename) (rename ((oldfilename), (newfilename)))
-#define g_rmdir(path) (rmdir ((path)))
-#define g_unlink(path) (unlink ((path)))
-#endif
-
-typedef struct _ThunarVfsTransferPair ThunarVfsTransferPair;
+typedef struct _ThunarVfsTransferNode ThunarVfsTransferNode;
static void thunar_vfs_transfer_job_class_init (ThunarVfsTransferJobClass *klass);
-static void thunar_vfs_transfer_job_init (ThunarVfsTransferJob *transfer_job);
static void thunar_vfs_transfer_job_finalize (GObject *object);
static void thunar_vfs_transfer_job_execute (ThunarVfsJob *job);
-static void thunar_vfs_transfer_job_update (ThunarVfsTransferJob *transfer_job);
-static gboolean thunar_vfs_transfer_job_progress (ThunarVfsFileSize current_total_size,
- ThunarVfsFileSize current_completed_size,
- gpointer user_data);
-static GList *thunar_vfs_transfer_job_collect_pairs (ThunarVfsTransferJob *transfer_job,
- ThunarVfsTransferPair *pair,
- GError **error);
-static void thunar_vfs_transfer_job_copy_pair (ThunarVfsTransferJob *transfer_job,
- ThunarVfsTransferPair *pair);
-static gboolean thunar_vfs_transfer_job_overwrite (ThunarVfsTransferJob *transfer_job,
- const GError *error);
-static gboolean thunar_vfs_transfer_job_skip (ThunarVfsTransferJob *transfer_job,
- const GError *error);
-static void thunar_vfs_transfer_job_skip_list_add (ThunarVfsTransferJob *transfer_job,
- ThunarVfsTransferPair *pair);
-static gboolean thunar_vfs_transfer_job_skip_list_has (ThunarVfsTransferJob *transfer_job,
- const ThunarVfsPath *source_path);
-static ThunarVfsTransferPair *thunar_vfs_transfer_job_alloc_pair (ThunarVfsTransferJob *transfer_job,
+static gboolean thunar_vfs_transfer_job_progress (ThunarVfsFileSize chunk_size,
+ gpointer callback_data);
+static gboolean thunar_vfs_transfer_job_copy_file (ThunarVfsTransferJob *transfer_job,
ThunarVfsPath *source_path,
ThunarVfsPath *target_path,
- gboolean toplevel,
+ ThunarVfsPath **target_path_return,
+ GError **error);
+static void thunar_vfs_transfer_job_node_copy (ThunarVfsTransferJob *transfer_job,
+ ThunarVfsTransferNode *transfer_node,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath *target_parent_path,
+ GList **target_path_list_return);
+static void thunar_vfs_transfer_node_free (ThunarVfsTransferNode *transfer_node);
+static gboolean thunar_vfs_transfer_node_collect (ThunarVfsTransferNode *transfer_node,
+ ThunarVfsFileSize *total_size_return,
+ volatile gboolean *cancelled,
GError **error);
-static inline void thunar_vfs_transfer_job_free_pair (ThunarVfsTransferJob *transfer_job,
- ThunarVfsTransferPair *pair);
@@ -105,48 +72,23 @@ struct _ThunarVfsTransferJob
{
ThunarVfsInteractiveJob __parent__;
- /* the VFS monitor */
- ThunarVfsMonitor *monitor;
-
- /* the list of pairs */
- GList *pairs;
-
- /* the pair chunks (alloc-only) */
- GMemChunk *pair_chunk;
-
/* whether to move files instead of copying them */
- gboolean move;
-
- /* the amount of completeness */
- ThunarVfsFileSize total_size;
- ThunarVfsFileSize completed_size;
-
- /* the last time we update the status info */
- GTimeVal last_update_time;
-
- /* current file status */
- gboolean current_path_changed;
- ThunarVfsPath *current_path;
- ThunarVfsFileSize current_total_size;
- ThunarVfsFileSize current_completed_size;
+ gboolean move;
- /* list of directories that should be deleted when the job finishes */
- GList *directories_to_delete;
+ /* the source nodes and the matching target paths */
+ GList *source_node_list;
+ GList *target_path_list;
- /* the list of toplevel ThunarVfsPath's that were created by this job */
- GList *new_files;
-
- /* the list of directories to skip */
- GList *skip_list;
+ /* the amount of completeness */
+ ThunarVfsFileSize total_size;
+ ThunarVfsFileSize completed_size;
};
-struct _ThunarVfsTransferPair
+struct _ThunarVfsTransferNode
{
- ThunarVfsPath *source_path;
- ThunarVfsPath *target_path;
- ThunarVfsFileSize source_size;
- guint source_mode : 31;
- gboolean toplevel : 1;
+ ThunarVfsPath *source_path;
+ ThunarVfsTransferNode *next;
+ ThunarVfsTransferNode *children;
};
@@ -167,7 +109,7 @@ thunar_vfs_transfer_job_get_type (void)
sizeof (ThunarVfsTransferJobClass),
thunar_vfs_transfer_job_class_init,
sizeof (ThunarVfsTransferJob),
- thunar_vfs_transfer_job_init,
+ NULL,
0);
}
@@ -194,50 +136,17 @@ thunar_vfs_transfer_job_class_init (ThunarVfsTransferJobClass *klass)
-static void
-thunar_vfs_transfer_job_init (ThunarVfsTransferJob *transfer_job)
-{
- /* connect to the VFS monitor */
- transfer_job->monitor = thunar_vfs_monitor_get_default ();
-
- /* allocate the pair chunk (alloc-only) */
- transfer_job->pair_chunk = g_mem_chunk_new ("ThunarVfsTransferPair chunk",
- sizeof (ThunarVfsTransferPair),
- sizeof (ThunarVfsTransferPair) * 256,
- G_ALLOC_ONLY);
-}
-
-
-
static void
thunar_vfs_transfer_job_finalize (GObject *object)
{
ThunarVfsTransferJob *transfer_job = THUNAR_VFS_TRANSFER_JOB (object);
- GList *lp;
-
- /* release the pairs */
- for (lp = transfer_job->pairs; lp != NULL; lp = lp->next)
- thunar_vfs_transfer_job_free_pair (transfer_job, lp->data);
- g_list_free (transfer_job->pairs);
-
- /* drop the list of directories to delete */
- thunar_vfs_path_list_free (transfer_job->directories_to_delete);
-
- /* release the new files list */
- thunar_vfs_path_list_free (transfer_job->new_files);
- /* release the skip list */
- thunar_vfs_path_list_free (transfer_job->skip_list);
+ /* release the source node list */
+ g_list_foreach (transfer_job->source_node_list, (GFunc) thunar_vfs_transfer_node_free, NULL);
+ g_list_free (transfer_job->source_node_list);
- /* release the current path */
- if (G_LIKELY (transfer_job->current_path != NULL))
- thunar_vfs_path_unref (transfer_job->current_path);
-
- /* destroy the pair chunk */
- g_mem_chunk_destroy (transfer_job->pair_chunk);
-
- /* disconnect from the VFS monitor */
- g_object_unref (G_OBJECT (transfer_job->monitor));
+ /* release the target path list */
+ thunar_vfs_path_list_free (transfer_job->target_path_list);
/* call the parents finalize method */
(*G_OBJECT_CLASS (thunar_vfs_transfer_job_parent_class)->finalize) (object);
@@ -248,610 +157,347 @@ thunar_vfs_transfer_job_finalize (GObject *object)
static void
thunar_vfs_transfer_job_execute (ThunarVfsJob *job)
{
- ThunarVfsTransferPair *pair;
+ ThunarVfsTransferNode *transfer_node;
ThunarVfsTransferJob *transfer_job = THUNAR_VFS_TRANSFER_JOB (job);
- gboolean result;
- GError *error;
- gchar *source_absolute_path;
- gchar *target_absolute_path;
- gchar *display_name;
- GList *pairs;
- GList *tmp;
- GList *lp;
+ ThunarVfsPath *target_path;
+ GError *err = NULL;
+ GList *new_files_list = NULL;
+ GList *snext;
+ GList *tnext;
+ GList *sp;
+ GList *tp;
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (job), _("Collecting files..."));
+ _thunar_vfs_return_if_fail (g_list_length (transfer_job->source_node_list) == g_list_length (transfer_job->target_path_list));
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_TRANSFER_JOB (transfer_job));
- /* save the current list of pairs */
- pairs = transfer_job->pairs;
- transfer_job->pairs = NULL;
+ /* update the progress information */
+ _thunar_vfs_job_info_message (job, _("Collecting files..."));
- /* collect pairs recursively */
- for (lp = pairs; lp != NULL; lp = lp->next)
+ /* collect all source transfer nodes (try to move the stuff first) */
+ for (sp = transfer_job->source_node_list, tp = transfer_job->target_path_list; sp != NULL; sp = snext, tp = tnext)
{
- /* determine the current pair */
- pair = (ThunarVfsTransferPair *) lp->data;
+ /* determine the next list items */
+ snext = sp->next;
+ tnext = tp->next;
- /* check if we want to move files, and try rename() first */
- if (G_UNLIKELY (transfer_job->move))
- {
- /* determine the absolute source and target paths */
- source_absolute_path = thunar_vfs_path_dup_string (pair->source_path);
- target_absolute_path = thunar_vfs_path_dup_string (pair->target_path);
+ /* determine the current source node */
+ transfer_node = sp->data;
- /* perform the rename if the target does not already exist */
- result = (!g_file_test (target_absolute_path, G_FILE_TEST_EXISTS) && (g_rename (source_absolute_path, target_absolute_path) == 0));
+ /* try to move the file/folder directly, otherwise fallback to copy logic */
+ if (transfer_job->move && _thunar_vfs_io_ops_move_file (transfer_node->source_path, tp->data, &target_path, NULL))
+ {
+ /* add the target file to the new files list */
+ new_files_list = g_list_prepend (new_files_list, target_path);
- /* release the absolute source and target paths */
- g_free (source_absolute_path);
- g_free (target_absolute_path);
+ /* move worked, don't need to keep this node */
+ thunar_vfs_transfer_node_free (transfer_node);
+ thunar_vfs_path_unref (tp->data);
- /* fallback to copy logic if the simple rename didn't work */
- if (G_LIKELY (result))
- {
- /* schedule a "created" event for the target file */
- thunar_vfs_monitor_feed (transfer_job->monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, pair->target_path);
-
- /* schedule a "deleted" event for the source file */
- thunar_vfs_monitor_feed (transfer_job->monitor, THUNAR_VFS_MONITOR_EVENT_DELETED, pair->source_path);
-
- /* add the target file to the new files list */
- transfer_job->new_files = thunar_vfs_path_list_prepend (transfer_job->new_files, pair->target_path);
-
- /* rename worked, no need to copy this pair */
- thunar_vfs_transfer_job_free_pair (transfer_job, pair);
- continue;
- }
+ /* drop the matching list items */
+ transfer_job->source_node_list = g_list_delete_link (transfer_job->source_node_list, sp);
+ transfer_job->target_path_list = g_list_delete_link (transfer_job->target_path_list, tp);
}
-
- /* prepare the pair for copying */
- tmp = thunar_vfs_transfer_job_collect_pairs (transfer_job, pair, NULL);
- transfer_job->pairs = g_list_concat (transfer_job->pairs, tmp);
- transfer_job->pairs = g_list_append (transfer_job->pairs, pair);
- }
-
- /* release the temporary list */
- g_list_free (pairs);
-
- /* reverse the pair list, so we have the directories first */
- transfer_job->pairs = g_list_reverse (transfer_job->pairs);
-
- /* determine the total number of bytes to process */
- for (lp = transfer_job->pairs; lp != NULL; lp = lp->next)
- {
- pair = (ThunarVfsTransferPair *) lp->data;
- transfer_job->total_size += pair->source_size;
- }
-
- /* process the pairs */
- while (transfer_job->pairs != NULL)
- {
- /* check if the job was cancelled */
- if (thunar_vfs_job_cancelled (job))
- break;
-
- /* pick the next pair from the list */
- pair = transfer_job->pairs->data;
- lp = transfer_job->pairs->next;
- g_list_free_1 (transfer_job->pairs);
- transfer_job->pairs = lp;
-
- /* check if we should skip this pair */
- if (thunar_vfs_transfer_job_skip_list_has (transfer_job, pair->source_path))
- {
- /* add the size that was calculated for the skipped pair */
- transfer_job->completed_size += pair->source_size;
- }
- else
+ else if (!thunar_vfs_transfer_node_collect (transfer_node, &transfer_job->total_size, &job->cancelled, &err))
{
- /* copy the pair */
- thunar_vfs_transfer_job_copy_pair (transfer_job, pair);
+ /* failed to collect, cannot continue */
+ break;
}
-
- /* drop the pair, to reduce the overhead for finalize() */
- thunar_vfs_transfer_job_free_pair (transfer_job, pair);
}
- /* delete the scheduled directories */
- if (transfer_job->directories_to_delete && transfer_job->move)
+ /* check if we succeed so far */
+ if (G_LIKELY (err == NULL))
{
- /* display info message */
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (job), _("Deleting directories..."));
-
- /* delete the directories */
- for (lp = transfer_job->directories_to_delete; lp != NULL; lp = lp->next)
+ /* perform the copy recursively for all source transfer nodes, that have not been skipped */
+ for (sp = transfer_job->source_node_list, tp = transfer_job->target_path_list; sp != NULL; sp = sp->next, tp = tp->next)
{
- /* check if the job was cancelled */
+ /* check if the process was cancelled */
if (thunar_vfs_job_cancelled (job))
break;
- /* check if we should skip this directory */
- if (thunar_vfs_transfer_job_skip_list_has (transfer_job, lp->data))
- continue;
-
- /* try to delete the source directory */
- source_absolute_path = thunar_vfs_path_dup_string (lp->data);
- if (g_rmdir (source_absolute_path) < 0 && errno != ENOENT)
- {
- /* ask the user whether we should skip this directory */
- display_name = g_filename_display_name (source_absolute_path);
- error = g_error_new (G_FILE_ERROR, g_file_error_from_errno (errno),
- _("Failed to remove directory \"%s\": %s"),
- display_name, g_strerror (errno));
- thunar_vfs_transfer_job_skip (transfer_job, error);
- g_clear_error (&error);
- g_free (display_name);
- }
- else
- {
- /* schedule a "deleted" event for the source directory */
- thunar_vfs_monitor_feed (transfer_job->monitor, THUNAR_VFS_MONITOR_EVENT_DELETED, lp->data);
- }
- g_free (source_absolute_path);
+ /* copy the file for this node */
+ thunar_vfs_transfer_job_node_copy (transfer_job, sp->data, tp->data, NULL, &new_files_list);
}
}
- /* emit the "new-files" signal if we have any new files */
- if (G_LIKELY (transfer_job->new_files != NULL))
- thunar_vfs_interactive_job_new_files (THUNAR_VFS_INTERACTIVE_JOB (transfer_job), transfer_job->new_files);
-}
-
-
-
-static void
-thunar_vfs_transfer_job_update (ThunarVfsTransferJob *transfer_job)
-{
- ThunarVfsFileSize completed_size;
- gdouble percentage;
- gchar *display_name;
-
- /* check if we need to display a new file name */
- if (G_LIKELY (transfer_job->current_path_changed))
+ /* check if we failed */
+ if (G_UNLIKELY (err != NULL))
{
- /* update the info message with the file name */
- display_name = g_filename_display_name (thunar_vfs_path_get_name (transfer_job->current_path));
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (transfer_job), display_name);
- g_free (display_name);
+ /* EINTR should be ignored, as it indicates user cancellation */
+ if (G_LIKELY (err->domain != G_FILE_ERROR || err->code != G_FILE_ERROR_INTR))
+ _thunar_vfs_job_error (job, err);
- /* remember that we don't need to update the info message again now */
- transfer_job->current_path_changed = FALSE;
+ /* we're done */
+ g_error_free (err);
}
- /* determine total/completed sizes */
- completed_size = transfer_job->completed_size + transfer_job->current_completed_size;
-
- /* update the percentage */
- percentage = (completed_size * 100.0) / MAX (transfer_job->total_size, 1);
- percentage = CLAMP (percentage, 0.0, 100.0);
- thunar_vfs_interactive_job_percent (THUNAR_VFS_INTERACTIVE_JOB (transfer_job), percentage);
-
- /* update the "last update time" */
- g_get_current_time (&transfer_job->last_update_time);
-}
-
-
-
-static inline gboolean
-should_update (const GTimeVal now,
- const GTimeVal last)
-{
- /* we want to update every 100ms */
- guint64 d = ((guint64) now.tv_sec - last.tv_sec) * G_USEC_PER_SEC
- + ((guint64) now.tv_usec - last.tv_usec);
- return (d > 100 * 1000);
+ /* emit the "new-files" signal if we have any new files */
+ if (!thunar_vfs_job_cancelled (job))
+ _thunar_vfs_job_new_files (job, new_files_list);
+ thunar_vfs_path_list_free (new_files_list);
}
static gboolean
-thunar_vfs_transfer_job_progress (ThunarVfsFileSize current_total_size,
- ThunarVfsFileSize current_completed_size,
- gpointer user_data)
-{
- ThunarVfsTransferJob *transfer_job = THUNAR_VFS_TRANSFER_JOB (user_data);
- GTimeVal now;
-
- /* update the current total/completed size */
- transfer_job->current_completed_size = current_completed_size;
- transfer_job->current_total_size = current_total_size;
-
- /* determine the current time */
- g_get_current_time (&now);
-
- /* check if we should update the user visible info */
- if (should_update (now, transfer_job->last_update_time))
- thunar_vfs_transfer_job_update (transfer_job);
-
- return !thunar_vfs_job_cancelled (THUNAR_VFS_JOB (transfer_job));
-}
-
-
-
-static inline ThunarVfsPath*
-make_target_path (ThunarVfsPath *target_base_path,
- ThunarVfsPath *source_base_path,
- ThunarVfsPath *source_path)
+thunar_vfs_transfer_job_progress (ThunarVfsFileSize chunk_size,
+ gpointer callback_data)
{
- typedef struct _Component
- {
- struct _Component *next;
- const gchar *name;
- } Component;
-
- ThunarVfsPath *target_path = thunar_vfs_path_ref (target_base_path);
- ThunarVfsPath *path;
- Component *components = NULL;
- Component *component;
-
- /* determine the components in reverse order */
- for (; !thunar_vfs_path_equal (source_base_path, source_path); source_path = thunar_vfs_path_get_parent (source_path))
- {
- g_assert (source_path != NULL);
- component = g_newa (Component, 1);
- component->next = components;
- component->name = thunar_vfs_path_get_name (source_path);
- components = component;
- }
+ ThunarVfsTransferJob *transfer_job = THUNAR_VFS_TRANSFER_JOB (callback_data);
+ gdouble percent;
- /* verify state */
- g_assert (thunar_vfs_path_equal (source_base_path, source_path));
+ /* update the current completed size */
+ transfer_job->completed_size += chunk_size;
- /* generate the target path */
- for (component = components; component != NULL; component = component->next)
+ /* check if we can calculate the percentage */
+ if (G_LIKELY (transfer_job->total_size > 0))
{
- /* allocate relative path for the component */
- path = thunar_vfs_path_relative (target_path, component->name);
- thunar_vfs_path_unref (target_path);
- target_path = path;
+ /* calculate the new percentage */
+ percent = (transfer_job->completed_size * 100.0) / transfer_job->total_size;
+ _thunar_vfs_job_percent (THUNAR_VFS_JOB (transfer_job), percent);
}
- return target_path;
+ return !thunar_vfs_job_cancelled (THUNAR_VFS_JOB (transfer_job));
}
-static GList*
-thunar_vfs_transfer_job_collect_pairs (ThunarVfsTransferJob *transfer_job,
- ThunarVfsTransferPair *pair,
- GError **error)
+static gboolean
+thunar_vfs_transfer_job_copy_file (ThunarVfsTransferJob *transfer_job,
+ ThunarVfsPath *source_path,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath **target_path_return,
+ GError **error)
{
- ThunarVfsTransferPair *child;
- ThunarVfsPath *target_path;
- GHashTable *source_to_target;
- GError *serror = NULL;
- GList *paths;
- GList *pairs = NULL;
- GList *lp;
+ ThunarVfsJobResponse response;
+ GError *err = NULL;
- /* check if the pair refers to a directory */
- if (G_UNLIKELY (!S_ISDIR (pair->source_mode)))
- return NULL;
+ _thunar_vfs_return_val_if_fail (THUNAR_VFS_IS_TRANSFER_JOB (transfer_job), FALSE);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (target_path_return != NULL, FALSE);
- /* scan the pair directory */
- paths = thunar_vfs_scandir (pair->source_path, &THUNAR_VFS_JOB (transfer_job)->cancelled, THUNAR_VFS_SCANDIR_RECURSIVE, NULL, &serror);
- if (G_UNLIKELY (serror != NULL))
- {
- g_propagate_error (error, serror);
- g_assert (paths == NULL);
- }
- else
+ /* various attemps to copy the file */
+ while (err == NULL && !thunar_vfs_job_cancelled (THUNAR_VFS_JOB (transfer_job)))
{
- /* simple optimization to save some memory (source->target directory mapping) */
- source_to_target = g_hash_table_new (thunar_vfs_path_hash, thunar_vfs_path_equal);
- g_hash_table_insert (source_to_target, pair->source_path, pair->target_path);
-
- /* translate the paths to pairs */
- for (lp = g_list_last (paths); lp != NULL; lp = lp->prev)
+ /* try to copy the file from source_path to the target_path */
+ if (_thunar_vfs_io_ops_copy_file (source_path, target_path, &target_path, thunar_vfs_transfer_job_progress, transfer_job, &err))
{
- /* determine the target path */
- target_path = g_hash_table_lookup (source_to_target, thunar_vfs_path_get_parent (lp->data));
- if (G_LIKELY (target_path != NULL))
- target_path = thunar_vfs_path_relative (target_path, thunar_vfs_path_get_name (lp->data));
- else
- target_path = make_target_path (pair->target_path, pair->source_path, lp->data);
-
- /* try to allocate a pair for the child */
- child = thunar_vfs_transfer_job_alloc_pair (transfer_job, lp->data, target_path, FALSE, NULL);
-
- /* release the reference on the target path (the child holds the reference now) */
- thunar_vfs_path_unref (target_path);
+ /* return the real target path */
+ *target_path_return = target_path;
+ return TRUE;
+ }
- /* release the reference on the source path (the child holds the reference now) */
- thunar_vfs_path_unref (lp->data);
+ /* check if we can recover from this error */
+ if (err->domain == G_FILE_ERROR && err->code == G_FILE_ERROR_EXIST)
+ {
+ /* ask the user whether to overwrite */
+ response = _thunar_vfs_job_ask_overwrite (THUNAR_VFS_JOB (transfer_job), "%s", err->message);
- /* prepend the child to the pair list */
- if (G_LIKELY (child != NULL))
- {
- /* cache directory source->target mappings */
- if (G_UNLIKELY (S_ISDIR (child->source_mode)))
- g_hash_table_insert (source_to_target, child->source_path, child->target_path);
+ /* reset the error */
+ g_clear_error (&err);
- /* add to the list of pairs */
- pairs = g_list_prepend (pairs, child);
- }
+ /* try to remove the target file if we should overwrite */
+ if (response == THUNAR_VFS_JOB_RESPONSE_YES && !_thunar_vfs_io_ops_remove (target_path, THUNAR_VFS_IO_OPS_IGNORE_ENOENT, &err))
+ break;
}
-
- /* drop the source->target directory mapping */
- g_hash_table_destroy (source_to_target);
-
- /* drop the path list */
- g_list_free (paths);
}
- return pairs;
-}
-
-
-
-static inline void
-maybe_replace_pair_target (ThunarVfsTransferPair *pair,
- ThunarVfsPath *previous_target_path,
- ThunarVfsPath *new_target_path)
-{
- ThunarVfsPath *path;
-
- /* check if the target path is below the previous_target_path */
- for (path = thunar_vfs_path_get_parent (pair->target_path); path != NULL; path = thunar_vfs_path_get_parent (path))
- if (thunar_vfs_path_equal (previous_target_path, path))
- break;
-
- if (G_LIKELY (path != NULL))
+ /* check if we were cancelled */
+ if (G_LIKELY (err == NULL))
+ {
+ /* user cancellation is represented by EINTR */
+ _thunar_vfs_set_g_error_from_errno (error, EINTR);
+ }
+ else
{
- /* replace the target path */
- path = make_target_path (new_target_path, path, pair->target_path);
- thunar_vfs_path_unref (pair->target_path);
- pair->target_path = path;
+ /* propagate the error */
+ g_propagate_error (error, err);
}
+
+ return FALSE;
}
static void
-thunar_vfs_transfer_job_copy_pair (ThunarVfsTransferJob *transfer_job,
- ThunarVfsTransferPair *pair)
+thunar_vfs_transfer_job_node_copy (ThunarVfsTransferJob *transfer_job,
+ ThunarVfsTransferNode *transfer_node,
+ ThunarVfsPath *target_path,
+ ThunarVfsPath *target_parent_path,
+ GList **target_path_list_return)
{
- ThunarVfsPath *target_path;
- gboolean skip;
- GError *error = NULL;
- GList *lp;
- gchar *absolute_path;
+ ThunarVfsPath *target_path_return;
gchar *display_name;
+ GError *err = NULL;
+
+ _thunar_vfs_return_if_fail ((target_path == NULL && target_parent_path != NULL) || (target_path != NULL && target_parent_path == NULL));
+ _thunar_vfs_return_if_fail (target_path == NULL || transfer_node->next == NULL);
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_TRANSFER_JOB (transfer_job));
+ _thunar_vfs_return_if_fail (transfer_node != NULL);
- /* update the current file path */
- if (G_LIKELY (transfer_job->current_path != NULL))
- thunar_vfs_path_unref (transfer_job->current_path);
- transfer_job->current_path = thunar_vfs_path_ref (pair->source_path);
- transfer_job->current_path_changed = TRUE;
+ /* The caller can either provide a target_path or a target_parent_path, but not both. The toplevel
+ * transfer_nodes (for which next is NULL) should be called with target_path, to get proper behavior
+ * wrt restoring files from the trash. Other transfer_nodes will be called with target_parent_path.
+ */
- /* perform the xfer */
- do
+ /* process all transfer nodes in the row */
+ for (; err == NULL && !thunar_vfs_job_cancelled (THUNAR_VFS_JOB (transfer_job)) && transfer_node != NULL; transfer_node = transfer_node->next)
{
- /* start with 0 completed/total current size */
- transfer_job->current_completed_size = 0;
- transfer_job->current_total_size = 0;
+ /* guess the target_path for this file item (if not provided) */
+ if (G_LIKELY (target_path == NULL))
+ target_path = thunar_vfs_path_relative (target_parent_path, thunar_vfs_path_get_name (transfer_node->source_path));
+ else
+ target_path = thunar_vfs_path_ref (target_path);
- /* try to xfer the file */
- if (thunar_vfs_xfer_copy (pair->source_path, pair->target_path, &target_path, thunar_vfs_transfer_job_progress, transfer_job, &error))
- {
- /* if this was a toplevel pair, then add the target path to the list of new files */
- if (G_UNLIKELY (pair->toplevel))
- transfer_job->new_files = thunar_vfs_path_list_prepend (transfer_job->new_files, target_path);
+ /* update the progress information */
+ display_name = _thunar_vfs_path_dup_display_name (_thunar_vfs_path_is_local (target_path) ? target_path : transfer_node->source_path);
+ _thunar_vfs_job_info_message (THUNAR_VFS_JOB (transfer_job), display_name);
+ g_free (display_name);
- /* perform cleanup for moves */
- if (G_UNLIKELY (transfer_job->move))
- {
- /* if we have a directory, schedule it for later deletion, else try to delete it directly */
- if (G_UNLIKELY (((pair->source_mode & S_IFMT) >> 12) == THUNAR_VFS_FILE_TYPE_DIRECTORY))
- {
- /* schedule the directory for later deletion */
- transfer_job->directories_to_delete = thunar_vfs_path_list_prepend (transfer_job->directories_to_delete, pair->source_path);
- }
- else
- {
- absolute_path = thunar_vfs_path_dup_string (pair->source_path);
- if (g_unlink (absolute_path) < 0 && errno != ENOENT)
- {
- /* ask the user whether we should skip the file (used for cancellation only) */
- display_name = g_filename_display_name (absolute_path);
- error = g_error_new (G_FILE_ERROR, g_file_error_from_errno (errno),
- _("Failed to remove \"%s\": %s"), display_name,
- g_strerror (errno));
- thunar_vfs_transfer_job_skip (transfer_job, error);
- g_clear_error (&error);
- g_free (display_name);
- }
- else
- {
- /* schedule a deleted event for the source path */
- thunar_vfs_monitor_feed (transfer_job->monitor, THUNAR_VFS_MONITOR_EVENT_DELETED, pair->source_path);
- }
- g_free (absolute_path);
- }
- }
- else if (!thunar_vfs_path_equal (pair->target_path, target_path))
+ /* copy the item specified by this node (not recursive!) */
+ if (thunar_vfs_transfer_job_copy_file (transfer_job, transfer_node->source_path, target_path, &target_path_return, &err))
+ {
+ /* check if we have children to copy */
+ if (transfer_node->children != NULL)
{
- /* replace the target path on the following elements */
- for (lp = transfer_job->pairs; lp != NULL; lp = lp->next)
- maybe_replace_pair_target (lp->data, pair->target_path, target_path);
+ /* copy all children for this node */
+ thunar_vfs_transfer_job_node_copy (transfer_job, transfer_node->children, NULL, target_path_return, NULL);
- /* replace the previous target path with the real target path */
- thunar_vfs_path_unref (pair->target_path);
- pair->target_path = thunar_vfs_path_ref (target_path);
+ /* free the resources allocated to the children */
+ thunar_vfs_transfer_node_free (transfer_node->children);
+ transfer_node->children = NULL;
}
- /* release the real target path */
- thunar_vfs_path_unref (target_path);
- break;
+ /* add the real target path to the return list */
+ if (G_LIKELY (target_path_list_return != NULL))
+ *target_path_list_return = g_list_prepend (*target_path_list_return, target_path_return);
+ else
+ thunar_vfs_path_unref (target_path_return);
}
- /* G_FILE_ERROR_INTR is returned when the job is cancelled during the copy operation */
- if (G_UNLIKELY (error->domain == G_FILE_ERROR && error->code == G_FILE_ERROR_INTR))
+ /* try to remove the source directory if we should move and didn't fail so far */
+ if (err == NULL && transfer_job->move && !_thunar_vfs_io_ops_remove (transfer_node->source_path, THUNAR_VFS_IO_OPS_IGNORE_ENOENT, &err))
{
- g_error_free (error);
- break;
+ /* we can ignore ENOTEMPTY (which is mapped to G_FILE_ERROR_FAILED) */
+ if (err->domain == G_FILE_ERROR && err->code == G_FILE_ERROR_FAILED)
+ g_clear_error (&err);
}
- /* check the error */
- if (error->domain == G_FILE_ERROR && error->code == G_FILE_ERROR_EXIST)
+ /* check if we failed (ENOSPC cannot be skipped) */
+ if (err != NULL && (err->domain != G_FILE_ERROR || err->code != G_FILE_ERROR_NOSPC))
{
- /* ask the user whether we should remove the target first */
- skip = !thunar_vfs_transfer_job_overwrite (transfer_job, error);
- g_clear_error (&error);
+ /* ask the user whether to skip this node and all subnodes (-> cancellation) */
+ if (!thunar_vfs_job_cancelled (THUNAR_VFS_JOB (transfer_job)))
+ _thunar_vfs_job_ask_skip (THUNAR_VFS_JOB (transfer_job), "%s", err->message);
- /* try to remove the target */
- if (G_LIKELY (!skip))
- {
- absolute_path = thunar_vfs_path_dup_string (pair->target_path);
- if (g_unlink (absolute_path) < 0 && errno != ENOENT)
- {
- /* ask the user whether we should skip the file */
- display_name = g_filename_display_name (absolute_path);
- error = g_error_new (G_FILE_ERROR, g_file_error_from_errno (errno),
- _("Failed to remove \"%s\": %s"), display_name,
- g_strerror (errno));
- skip = thunar_vfs_transfer_job_skip (transfer_job, error);
- g_free (display_name);
- }
- g_free (absolute_path);
- }
- }
- else
- {
- /* ask the user whether to skip this pair */
- skip = thunar_vfs_transfer_job_skip (transfer_job, error);
+ /* reset the error */
+ g_clear_error (&err);
}
- /* clear the error */
- g_clear_error (&error);
-
- /* check if we should skip this pair */
- if (G_LIKELY (skip))
- {
- thunar_vfs_transfer_job_skip_list_add (transfer_job, pair);
- break;
- }
+ /* release the guessed target_path */
+ thunar_vfs_path_unref (target_path);
+ target_path = NULL;
}
- while (!thunar_vfs_job_cancelled (THUNAR_VFS_JOB (transfer_job)));
-
- /* add the current file's size to the total completion state */
- transfer_job->completed_size += transfer_job->current_completed_size;
-
- /* reset the current completed/total size */
- transfer_job->current_completed_size = 0;
- transfer_job->current_total_size = 0;
}
-static gboolean
-thunar_vfs_transfer_job_overwrite (ThunarVfsTransferJob *transfer_job,
- const GError *error)
-{
- gboolean overwrite;
- gchar *message;
-
- /* be sure to update the status info */
- thunar_vfs_transfer_job_update (transfer_job);
-
- /* ask the user whether to overwrite */
- message = g_strdup_printf (_("%s.\n\nDo you want to overwrite it?"), error->message);
- overwrite = thunar_vfs_interactive_job_overwrite (THUNAR_VFS_INTERACTIVE_JOB (transfer_job), message);
- g_free (message);
-
- return overwrite;
-}
static gboolean
-thunar_vfs_transfer_job_skip (ThunarVfsTransferJob *transfer_job,
- const GError *error)
+thunar_vfs_transfer_node_collect (ThunarVfsTransferNode *transfer_node,
+ ThunarVfsFileSize *total_size_return,
+ volatile gboolean *cancelled,
+ GError **error)
{
- gboolean skip;
- gchar *message;
-
- /* be sure to update the status info */
- thunar_vfs_transfer_job_update (transfer_job);
-
- /* ask the user whether to skip */
- message = g_strdup_printf (_("%s.\n\nDo you want to skip it?"), error->message);
- skip = thunar_vfs_interactive_job_skip (THUNAR_VFS_INTERACTIVE_JOB (transfer_job), message);
- g_free (message);
+ ThunarVfsTransferNode *child_node;
+ ThunarVfsFileSize size;
+ ThunarVfsFileType type;
+ GError *err = NULL;
+ GList *path_list;
+ GList *lp;
- return skip;
-}
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (total_size_return != NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (transfer_node != NULL, FALSE);
+ _thunar_vfs_return_val_if_fail (cancelled != NULL, FALSE);
+ /* determine the file size and mode */
+ if (!_thunar_vfs_io_ops_get_file_size_and_type (transfer_node->source_path, &size, &type, error))
+ return FALSE;
+ /* add the file size to the total size */
+ *total_size_return += size;
-static void
-thunar_vfs_transfer_job_skip_list_add (ThunarVfsTransferJob *transfer_job,
- ThunarVfsTransferPair *pair)
-{
- /* add only directories to the skip_list */
- if (((pair->source_mode & S_IFMT) >> 12) == THUNAR_VFS_FILE_TYPE_DIRECTORY)
- transfer_job->skip_list = thunar_vfs_path_list_prepend (transfer_job->skip_list, pair->source_path);
-}
+ /* check if we have a directory here */
+ if (type == THUNAR_VFS_FILE_TYPE_DIRECTORY)
+ {
+ /* scan the directory and add appropriate children for this transfer node */
+ path_list = _thunar_vfs_io_scandir (transfer_node->source_path, cancelled, 0, &err);
+ for (lp = path_list; err == NULL && lp != NULL; lp = lp->next)
+ {
+ /* check if the user cancelled the process */
+ if (G_UNLIKELY (*cancelled))
+ {
+ /* user cancellation is represented as EINTR */
+ _thunar_vfs_set_g_error_from_errno (&err, EINTR);
+ }
+ else
+ {
+ /* allocate a new transfer node for the child */
+ child_node = _thunar_vfs_slice_new0 (ThunarVfsTransferNode);
+ child_node->source_path = lp->data;
+ /* hook the child node into the child list */
+ child_node->next = transfer_node->children;
+ transfer_node->children = child_node;
+ /* collect the child node */
+ thunar_vfs_transfer_node_collect (child_node, total_size_return, cancelled, &err);
+ }
+ }
-static gboolean
-thunar_vfs_transfer_job_skip_list_has (ThunarVfsTransferJob *transfer_job,
- const ThunarVfsPath *source_path)
-{
- const ThunarVfsPath *path;
- GList *lp;
+ /* release the remaining items on the path_list */
+ g_list_foreach (lp, (GFunc) thunar_vfs_path_unref, NULL);
+ g_list_free (path_list);
+ }
- /* check if the source_path or any of its ancestors is on the skip list */
- for (lp = transfer_job->skip_list; lp != NULL; lp = lp->next)
- for (path = source_path; path != NULL; path = thunar_vfs_path_get_parent (path))
- if (thunar_vfs_path_equal (path, lp->data))
- return TRUE;
+ /* check if we failed */
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
- return FALSE;
+ return TRUE;
}
-static ThunarVfsTransferPair*
-thunar_vfs_transfer_job_alloc_pair (ThunarVfsTransferJob *transfer_job,
- ThunarVfsPath *source_path,
- ThunarVfsPath *target_path,
- gboolean toplevel,
- GError **error)
+static void
+thunar_vfs_transfer_node_free (ThunarVfsTransferNode *transfer_node)
{
- ThunarVfsTransferPair *pair;
- struct stat source_statb;
- gchar source_absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
-
- /* determine the absolute path to the source file */
- if (thunar_vfs_path_to_string (source_path, source_absolute_path, sizeof (source_absolute_path), error) < 0)
- return NULL;
+ ThunarVfsTransferNode *transfer_next;
- /* determine the file info for the source file */
- if (g_lstat (source_absolute_path, &source_statb) < 0)
+ /* free all nodes in a row */
+ while (transfer_node != NULL)
{
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), g_strerror (errno));
- return NULL;
- }
-
- /* allocate a new transfer pair */
- pair = g_chunk_new (ThunarVfsTransferPair, transfer_job->pair_chunk);
- pair->source_path = thunar_vfs_path_ref (source_path);
- pair->target_path = thunar_vfs_path_ref (target_path);
- pair->source_size = source_statb.st_size;
- pair->source_mode = source_statb.st_mode;
- pair->toplevel = toplevel;
+ /* free all children of this node */
+ thunar_vfs_transfer_node_free (transfer_node->children);
- return pair;
-}
+ /* determine the next node */
+ transfer_next = transfer_node->next;
+ /* drop the source path for this node */
+ thunar_vfs_path_unref (transfer_node->source_path);
+ /* release the resources for this node */
+ _thunar_vfs_slice_free (ThunarVfsTransferNode, transfer_node);
-static inline void
-thunar_vfs_transfer_job_free_pair (ThunarVfsTransferJob *transfer_job,
- ThunarVfsTransferPair *pair)
-{
- thunar_vfs_path_unref (pair->source_path);
- thunar_vfs_path_unref (pair->target_path);
+ /* continue with the next node */
+ transfer_node = transfer_next;
+ }
}
@@ -881,46 +527,47 @@ thunar_vfs_transfer_job_new (GList *source_path_list,
gboolean move,
GError **error)
{
- ThunarVfsTransferPair *pair;
+ ThunarVfsTransferNode *transfer_node;
ThunarVfsTransferJob *transfer_job;
GList *sp, *tp;
- g_return_val_if_fail (g_list_length (target_path_list) == g_list_length (source_path_list), NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+ _thunar_vfs_return_val_if_fail (g_list_length (target_path_list) == g_list_length (source_path_list), NULL);
+ _thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
/* allocate the job object */
transfer_job = g_object_new (THUNAR_VFS_TYPE_TRANSFER_JOB, NULL);
transfer_job->move = move;
- /* just create a pair for every (source, target) tuple */
+ /* add a transfer node for each source path, and a matching target parent path */
for (sp = source_path_list, tp = target_path_list; sp != NULL; sp = sp->next, tp = tp->next)
{
/* verify that we don't transfer the root directory */
if (G_UNLIKELY (thunar_vfs_path_is_root (sp->data) || thunar_vfs_path_is_root (tp->data)))
{
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
- _("Cannot transfer the root directory"));
- goto failure;
+ /* just return EINVAL, as the file manager will prevent this anyway */
+ _thunar_vfs_set_g_error_from_errno (error, EINVAL);
+ g_object_unref (G_OBJECT (transfer_job));
+ return NULL;
}
/* strip off all pairs with source=target when not copying */
if (G_LIKELY (!move || !thunar_vfs_path_equal (sp->data, tp->data)))
{
- /* allocate a pair */
- pair = thunar_vfs_transfer_job_alloc_pair (transfer_job, sp->data, tp->data, TRUE, error);
- if (G_UNLIKELY (pair == NULL))
- goto failure;
- transfer_job->pairs = g_list_prepend (transfer_job->pairs, pair);
+ /* allocate a node for the source and add it to the source list */
+ transfer_node = _thunar_vfs_slice_new0 (ThunarVfsTransferNode);
+ transfer_node->source_path = thunar_vfs_path_ref (sp->data);
+ transfer_job->source_node_list = g_list_append (transfer_job->source_node_list, transfer_node);
+
+ /* append the target path to the target list */
+ transfer_job->target_path_list = thunar_vfs_path_list_append (transfer_job->target_path_list, tp->data);
}
}
- /* we did it */
- return THUNAR_VFS_JOB (transfer_job);
+ /* make sure that we did not mess up anything */
+ _thunar_vfs_assert (g_list_length (transfer_job->source_node_list) == g_list_length (transfer_job->target_path_list));
- /* some of the sources failed */
-failure:
- g_object_unref (G_OBJECT (transfer_job));
- return NULL;
+ /* the job is ready */
+ return THUNAR_VFS_JOB (transfer_job);
}
diff --git a/thunar-vfs/thunar-vfs-unlink-job.c b/thunar-vfs/thunar-vfs-unlink-job.c
deleted file mode 100644
index 74b10bc855ef4b3036f783588ea66bc036453ecd..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-unlink-job.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <thunar-vfs/thunar-vfs-info.h>
-#include <thunar-vfs/thunar-vfs-scandir.h>
-#include <thunar-vfs/thunar-vfs-private.h>
-#include <thunar-vfs/thunar-vfs-thumb.h>
-#include <thunar-vfs/thunar-vfs-unlink-job.h>
-#include <thunar-vfs/thunar-vfs-alias.h>
-
-/* use g_remove() and g_unlink() on win32 */
-#if GLIB_CHECK_VERSION(2,6,0) && defined(G_OS_WIN32)
-#include <glib/gstdio.h>
-#else
-#define g_remove(path) (remove ((path)))
-#define g_unlink(path) (unlink ((path)))
-#endif
-
-
-
-static void thunar_vfs_unlink_job_class_init (ThunarVfsJobClass *klass);
-static void thunar_vfs_unlink_job_finalize (GObject *object);
-static void thunar_vfs_unlink_job_execute (ThunarVfsJob *job);
-static void thunar_vfs_unlink_job_remove (ThunarVfsUnlinkJob *unlink_job,
- ThunarVfsPath *path);
-
-
-
-struct _ThunarVfsUnlinkJobClass
-{
- ThunarVfsInteractiveJobClass __parent__;
-};
-
-struct _ThunarVfsUnlinkJob
-{
- ThunarVfsInteractiveJob __parent__;
-
- GList *path_list;
-
- gint total_items;
- gint completed_items;
-};
-
-
-
-static GObjectClass *thunar_vfs_unlink_job_parent_class;
-
-
-
-GType
-thunar_vfs_unlink_job_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_INTERACTIVE_JOB,
- "ThunarVfsUnlinkJob",
- sizeof (ThunarVfsUnlinkJobClass),
- thunar_vfs_unlink_job_class_init,
- sizeof (ThunarVfsUnlinkJob),
- NULL,
- 0);
- }
-
- return type;
-}
-
-
-
-static void
-thunar_vfs_unlink_job_class_init (ThunarVfsJobClass *klass)
-{
- GObjectClass *gobject_class;
-
- /* determine the parent class */
- thunar_vfs_unlink_job_parent_class = g_type_class_peek_parent (klass);
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = thunar_vfs_unlink_job_finalize;
-
- klass->execute = thunar_vfs_unlink_job_execute;
-}
-
-
-
-static void
-thunar_vfs_unlink_job_finalize (GObject *object)
-{
- ThunarVfsUnlinkJob *unlink_job = THUNAR_VFS_UNLINK_JOB (object);
-
- /* free the path list */
- thunar_vfs_path_list_free (unlink_job->path_list);
-
- /* call the parents finalize method */
- (*G_OBJECT_CLASS (thunar_vfs_unlink_job_parent_class)->finalize) (object);
-}
-
-
-
-static void
-thunar_vfs_unlink_job_execute (ThunarVfsJob *job)
-{
- ThunarVfsUnlinkJob *unlink_job = THUNAR_VFS_UNLINK_JOB (job);
- gdouble percent;
- GError *error = NULL;
- GList *paths;
- GList *lp;
- guint n;
-
- /* tell the user that we're preparing the unlink job */
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (job), _("Preparing..."));
-
- /* recursively collect the paths */
- for (lp = unlink_job->path_list; lp != NULL && !thunar_vfs_job_cancelled (job); lp = lp->next)
- {
- /* scan the directory */
- paths = thunar_vfs_scandir (lp->data, &job->cancelled, THUNAR_VFS_SCANDIR_RECURSIVE, NULL, &error);
- if (G_UNLIKELY (error != NULL))
- {
- /* we can safely ignore ENOENT/ENOTDIR errors here */
- if (error->domain != G_FILE_ERROR || (error->code != G_FILE_ERROR_NOENT && error->code != G_FILE_ERROR_NOTDIR))
- {
- /* inform the user about the problem and abort the job */
- thunar_vfs_job_error (job, error);
- g_error_free (error);
- return;
- }
-
- /* reset the error */
- g_error_free (error);
- error = NULL;
- }
-
- /* prepend the new paths to the existing list */
- unlink_job->path_list = g_list_concat (paths, unlink_job->path_list);
- }
-
- /* determine the number of files to remove */
- unlink_job->total_items = g_list_length (unlink_job->path_list);
-
- /* perform the removal of the paths */
- for (lp = unlink_job->path_list, n = 0; lp != NULL && !thunar_vfs_job_cancelled (job); lp = lp->next, ++n)
- {
- /* remove the file for the current path */
- thunar_vfs_unlink_job_remove (unlink_job, lp->data);
-
- /* increment the completed items count */
- ++unlink_job->completed_items;
-
- /* update the progress status */
- if (G_UNLIKELY ((n % 8) == 0 || lp->next == NULL))
- {
- percent = (unlink_job->completed_items * 100.0) / unlink_job->total_items;
- percent = CLAMP (percent, 0.0, 100.0);
- thunar_vfs_interactive_job_percent (THUNAR_VFS_INTERACTIVE_JOB (job), percent);
- }
- }
-}
-
-
-
-static void
-thunar_vfs_unlink_job_remove (ThunarVfsUnlinkJob *unlink_job,
- ThunarVfsPath *path)
-{
- ThunarVfsInfo *info;
- gchar *message;
- gchar *absolute_path;
- gchar *thumbnail_path;
-
- /* determine the absolute path to the file */
- absolute_path = thunar_vfs_path_dup_string (path);
-
- /* determine the info for the file */
- info = _thunar_vfs_info_new_internal (path, absolute_path, NULL);
- if (G_LIKELY (info != NULL))
- {
- /* update the progress message */
- thunar_vfs_interactive_job_info_message (THUNAR_VFS_INTERACTIVE_JOB (unlink_job), info->display_name);
-
- /* try to unlink the file */
- if (G_UNLIKELY (g_remove (absolute_path) < 0 && errno != ENOENT))
- {
- message = g_strdup_printf (_("Failed to remove \"%s\".\n\nDo you want to skip it?"), info->display_name);
- thunar_vfs_interactive_job_skip (THUNAR_VFS_INTERACTIVE_JOB (unlink_job), message);
- g_free (message);
- }
- else
- {
- /* feed a delete event to the vfs monitor */
- thunar_vfs_monitor_feed (THUNAR_VFS_INTERACTIVE_JOB (unlink_job)->monitor,
- THUNAR_VFS_MONITOR_EVENT_DELETED, info->path);
-
- /* delete thumbnails for regular files */
- if (G_LIKELY (info->type == THUNAR_VFS_FILE_TYPE_REGULAR))
- {
- /* ditch the normal thumbnail (if any) */
- thumbnail_path = thunar_vfs_thumbnail_for_path (path, THUNAR_VFS_THUMB_SIZE_NORMAL);
- g_unlink (thumbnail_path);
- g_free (thumbnail_path);
-
- /* ditch the large thumbnail (if any) */
- thumbnail_path = thunar_vfs_thumbnail_for_path (path, THUNAR_VFS_THUMB_SIZE_LARGE);
- g_unlink (thumbnail_path);
- g_free (thumbnail_path);
- }
- }
-
- /* release the info */
- thunar_vfs_info_unref (info);
- }
-
- /* release the absolute path */
- g_free (absolute_path);
-}
-
-
-
-/**
- * thunar_vfs_unlink_job_new:
- * @path_list : a list of #ThunarVfsPath<!---->s, that should be unlinked.
- * @error : return location for errors or %NULL.
- *
- * Tries to allocate a new #ThunarVfsUnlinkJob, which can be used to
- * unlink the given @path_list.
- *
- * Return value: the newly allocated #ThunarVfsUnlinkJob or %NULL on error.
- **/
-ThunarVfsJob*
-thunar_vfs_unlink_job_new (GList *path_list,
- GError **error)
-{
- ThunarVfsUnlinkJob *job;
-
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- /* allocate the job instance */
- job = g_object_new (THUNAR_VFS_TYPE_UNLINK_JOB, NULL);
- job->path_list = thunar_vfs_path_list_copy (path_list);
-
- return THUNAR_VFS_JOB (job);
-}
-
-
-
-#define __THUNAR_VFS_UNLINK_JOB_C__
-#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-unlink-job.h b/thunar-vfs/thunar-vfs-unlink-job.h
deleted file mode 100644
index 200c81c348444dce1a6471f064a43dd246a7ae94..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-unlink-job.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __THUNAR_VFS_UNLINK_JOB_H__
-#define __THUNAR_VFS_UNLINK_JOB_H__
-
-#include <thunar-vfs/thunar-vfs-interactive-job.h>
-#include <thunar-vfs/thunar-vfs-path.h>
-
-G_BEGIN_DECLS;
-
-typedef struct _ThunarVfsUnlinkJobClass ThunarVfsUnlinkJobClass;
-typedef struct _ThunarVfsUnlinkJob ThunarVfsUnlinkJob;
-
-#define THUNAR_VFS_TYPE_UNLINK_JOB (thunar_vfs_unlink_job_get_type ())
-#define THUNAR_VFS_UNLINK_JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_UNLINK_JOB, ThunarVfsUnlinkJob))
-#define THUNAR_VFS_UNLINK_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_UNLINK_JOB, ThunarVfsUnlinkJobClass))
-#define THUNAR_VFS_IS_UNLINK_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_UNLINK_JOB))
-#define THUNAR_VFS_IS_UNLINK_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_UNLINK_JOB))
-#define THUNAR_VFS_UNLINK_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_UNLINK_JOB, ThunarVfsUnlinkJobClass))
-
-GType thunar_vfs_unlink_job_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
-
-ThunarVfsJob *thunar_vfs_unlink_job_new (GList *path_list,
- GError **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_VFS_UNLINK_JOB_H__ */
diff --git a/thunar-vfs/thunar-vfs-volume-hal.c b/thunar-vfs/thunar-vfs-volume-hal.c
index f6188c67fd0eca3a6eed8483512012f9b24a735b..bdb0dc2ad42f74d709d6817fad5940d34c2b2822 100644
--- a/thunar-vfs/thunar-vfs-volume-hal.c
+++ b/thunar-vfs/thunar-vfs-volume-hal.c
@@ -435,9 +435,9 @@ thunar_vfs_volume_hal_update (ThunarVfsVolumeHal *volume_hal,
gchar *basename;
gchar *filename;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_HAL (volume_hal));
- g_return_if_fail (hv != NULL);
- g_return_if_fail (hd != NULL);
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_VOLUME_HAL (volume_hal));
+ _thunar_vfs_return_if_fail (hv != NULL);
+ _thunar_vfs_return_if_fail (hd != NULL);
/* just allocate a policy (doesn't seem to be very useful) */
policy = libhal_storage_policy_new ();
@@ -912,8 +912,8 @@ thunar_vfs_volume_manager_hal_device_added (LibHalContext *context,
LibHalDrive *hd;
const gchar *drive_udi;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER_HAL (manager_hal));
- g_return_if_fail (manager_hal->context == context);
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER_HAL (manager_hal));
+ _thunar_vfs_return_if_fail (manager_hal->context == context);
/* check if we have a volume here */
hv = libhal_volume_from_udi (context, udi);
@@ -976,8 +976,8 @@ thunar_vfs_volume_manager_hal_device_removed (LibHalContext *context,
ThunarVfsVolumeManagerHal *manager_hal = libhal_ctx_get_user_data (context);
ThunarVfsVolumeHal *volume_hal;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER_HAL (manager_hal));
- g_return_if_fail (manager_hal->context == context);
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER_HAL (manager_hal));
+ _thunar_vfs_return_if_fail (manager_hal->context == context);
/* check if we already have a volume object for the UDI */
volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
@@ -997,8 +997,8 @@ thunar_vfs_volume_manager_hal_device_new_capability (LibHalContext *context,
{
ThunarVfsVolumeManagerHal *manager_hal = libhal_ctx_get_user_data (context);
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER_HAL (manager_hal));
- g_return_if_fail (manager_hal->context == context);
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER_HAL (manager_hal));
+ _thunar_vfs_return_if_fail (manager_hal->context == context);
/* update the volume for the device (if any) */
thunar_vfs_volume_manager_hal_update_volume_by_udi (manager_hal, udi);
@@ -1013,8 +1013,8 @@ thunar_vfs_volume_manager_hal_device_lost_capability (LibHalContext *context,
{
ThunarVfsVolumeManagerHal *manager_hal = libhal_ctx_get_user_data (context);
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER_HAL (manager_hal));
- g_return_if_fail (manager_hal->context == context);
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER_HAL (manager_hal));
+ _thunar_vfs_return_if_fail (manager_hal->context == context);
/* update the volume for the device (if any) */
thunar_vfs_volume_manager_hal_update_volume_by_udi (manager_hal, udi);
@@ -1031,8 +1031,8 @@ thunar_vfs_volume_manager_hal_device_property_modified (LibHalContext *context,
{
ThunarVfsVolumeManagerHal *manager_hal = libhal_ctx_get_user_data (context);
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER_HAL (manager_hal));
- g_return_if_fail (manager_hal->context == context);
+ _thunar_vfs_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER_HAL (manager_hal));
+ _thunar_vfs_return_if_fail (manager_hal->context == context);
/* update the volume for the device (if any) */
thunar_vfs_volume_manager_hal_update_volume_by_udi (manager_hal, udi);
diff --git a/thunar-vfs/thunar-vfs-volume-manager.c b/thunar-vfs/thunar-vfs-volume-manager.c
index 155a07b319c592b2e4ed78224b95e19427909237..97364fbc0748b0c7542951dec15a28386e7aa098 100644
--- a/thunar-vfs/thunar-vfs-volume-manager.c
+++ b/thunar-vfs/thunar-vfs-volume-manager.c
@@ -23,6 +23,7 @@
#endif
#include <thunar-vfs/thunar-vfs-enum-types.h>
+#include <thunar-vfs/thunar-vfs-path-private.h>
#include <thunar-vfs/thunar-vfs-private.h>
#include <thunar-vfs/thunar-vfs-volume-freebsd.h>
#include <thunar-vfs/thunar-vfs-volume-hal.h>
@@ -243,27 +244,36 @@ thunar_vfs_volume_manager_real_get_volume_by_info (ThunarVfsVolumeManager *manag
{
ThunarVfsVolume *best_volume = NULL;
ThunarVfsPath *best_path = NULL;
+ ThunarVfsPath *info_path;
ThunarVfsPath *path;
GList *lp;
- /* otherwise try to find it the hard way */
- for (lp = manager->volumes; lp != NULL; lp = lp->next)
+ /* translate the info's path to a local path */
+ info_path = _thunar_vfs_path_translate (info->path, THUNAR_VFS_PATH_SCHEME_FILE, NULL);
+ if (G_LIKELY (info_path != NULL))
{
- /* check if the volume is mounted */
- if (!thunar_vfs_volume_is_mounted (lp->data))
- continue;
-
- /* check if the mount point is an ancestor of the info path */
- path = thunar_vfs_volume_get_mount_point (lp->data);
- if (path == NULL || (!thunar_vfs_path_equal (info->path, path) && !thunar_vfs_path_is_ancestor (info->path, path)))
- continue;
-
- /* possible match, check if better than previous match */
- if (best_volume == NULL || thunar_vfs_path_equal (path, best_path) || thunar_vfs_path_is_ancestor (path, best_path))
+ /* otherwise try to find it the hard way */
+ for (lp = manager->volumes; lp != NULL; lp = lp->next)
{
- best_volume = lp->data;
- best_path = path;
+ /* check if the volume is mounted */
+ if (!thunar_vfs_volume_is_mounted (lp->data))
+ continue;
+
+ /* check if the mount point is an ancestor of the info path */
+ path = thunar_vfs_volume_get_mount_point (lp->data);
+ if (path == NULL || (!thunar_vfs_path_equal (info_path, path) && !thunar_vfs_path_is_ancestor (info_path, path)))
+ continue;
+
+ /* possible match, check if better than previous match */
+ if (best_volume == NULL || thunar_vfs_path_equal (path, best_path) || thunar_vfs_path_is_ancestor (path, best_path))
+ {
+ best_volume = lp->data;
+ best_path = path;
+ }
}
+
+ /* cleanup */
+ thunar_vfs_path_unref (info_path);
}
return best_volume;
diff --git a/thunar-vfs/thunar-vfs-xfer.c b/thunar-vfs/thunar-vfs-xfer.c
deleted file mode 100644
index 0ff9498b7fd843704b37b729d917b09851228e31..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-xfer.c
+++ /dev/null
@@ -1,841 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_STATFS_H
-#include <sys/statfs.h>
-#endif
-#ifdef HAVE_SYS_STATVFS_H
-#include <sys/statvfs.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <thunar-vfs/thunar-vfs-monitor.h>
-#include <thunar-vfs/thunar-vfs-xfer.h>
-#include <thunar-vfs/thunar-vfs-alias.h>
-
-/* use g_lstat(), g_mkdir(), g_open() and g_unlink() on win32 */
-#if GLIB_CHECK_VERSION(2,6,0) && defined(G_OS_WIN32)
-#include <glib/gstdio.h>
-#else
-#define g_lstat(path, buffer) (lstat ((path), (buffer)))
-#define g_mkdir(path, mode) (mkdir ((path), (mode)))
-#define g_open(path, flags, mode) (open ((path), (flags), (mode)))
-#define g_unlink(path) (unlink ((path)))
-#endif
-
-#ifndef O_NOFOLLOW
-#define O_NOFOLLOW 0
-#endif
-
-
-
-/* modes of xfer operation */
-typedef enum
-{
- THUNAR_VFS_XFER_COPY,
- THUNAR_VFS_XFER_LINK,
-} ThunarVfsXferMode;
-
-
-
-static gboolean tvxc_mounted_readonly (gint fd);
-static void tvxc_set_error_from_errno (GError **error,
- const gchar *message,
- const gchar *path);
-static ThunarVfsPath *thunar_vfs_xfer_next_path (const ThunarVfsPath *source_path,
- ThunarVfsPath *target_directory_path,
- guint n,
- ThunarVfsXferMode mode,
- GError **error);
-static inline gboolean thunar_vfs_xfer_copy_directory (const gchar *source_absolute_path,
- const gchar *target_absolute_path,
- const struct stat *source_statb,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- gboolean merge_directories,
- GError **error);
-static inline gboolean thunar_vfs_xfer_copy_fifo (const gchar *source_absolute_path,
- const gchar *target_absolute_path,
- const struct stat *source_statb,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- GError **error);
-static inline gboolean thunar_vfs_xfer_copy_regular (const gchar *source_absolute_path,
- const gchar *target_absolute_path,
- const struct stat *source_statb,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- GError **error);
-static inline gboolean thunar_vfs_xfer_copy_symlink (const gchar *source_absolute_path,
- const gchar *target_absolute_path,
- const struct stat *source_statb,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- GError **error);
-static gboolean thunar_vfs_xfer_copy_internal (const ThunarVfsPath *source_path,
- ThunarVfsPath *target_path,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- gboolean merge_directories,
- GError **error);
-static inline gboolean thunar_vfs_xfer_link_internal (const ThunarVfsPath *source_path,
- ThunarVfsPath *target_path,
- GError **error);
-
-
-
-/* reference to the global ThunarVfsMonitor instance */
-static ThunarVfsMonitor *thunar_vfs_xfer_monitor = NULL;
-
-
-
-static gboolean
-tvxc_mounted_readonly (gint fd)
-{
-#if defined(HAVE_STATVFS)
- struct statvfs statvfsb;
- return (fstatvfs (fd, &statvfsb) == 0 && (statvfsb.f_flag & ST_RDONLY) != 0);
-#elif defined(HAVE_STATFS)
- struct statfs statfsb;
- return (fstatfs (fd, &statfsb) == 0 && (statfsb.f_flags & MNT_RDONLY) != 0);
-#else
- return FALSE;
-#endif
-}
-
-
-
-static void
-tvxc_set_error_from_errno (GError **error,
- const gchar *message,
- const gchar *path)
-{
- gchar *display_name;
- gchar *format;
- gint sverrno;
-
- /* save the errno value, as it may be modified */
- sverrno = errno;
-
- /* determine the display name for the path */
- display_name = g_filename_display_name (path);
-
- /* setup the error */
- format = g_strconcat (message, ": %s", NULL);
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (sverrno),
- format, display_name, g_strerror (sverrno));
- g_free (format);
-
- /* release the display name */
- g_free (display_name);
-}
-
-
-
-/* generates the next duplicate/link name */
-static ThunarVfsPath*
-thunar_vfs_xfer_next_path (const ThunarVfsPath *source_path,
- ThunarVfsPath *target_directory_path,
- guint n,
- ThunarVfsXferMode mode,
- GError **error)
-{
- static const gchar * const NAMES[3][2] =
- {
- {
- N_ ("copy of %s"),
- N_ ("link to %s"),
- },
- {
- N_ ("another copy of %s"),
- N_ ("another link to %s"),
- },
- {
- N_ ("third copy of %s"),
- N_ ("third link to %s"),
- },
- };
-
- ThunarVfsPath *target_path;
- const gchar *source_name;
- gchar *source_display_name;
- gchar *target_display_name;
- gchar *target_name;
- gchar *swap_name;
- gchar *tmp_name;
- guint m;
-
- g_return_val_if_fail (n > 0, NULL);
-
- /* try to determine the display name for the source file (in UTF-8) */
- source_name = thunar_vfs_path_get_name (source_path);
- source_display_name = g_filename_to_utf8 (source_name, -1, NULL, NULL, error);
- if (G_UNLIKELY (source_display_name == NULL))
- return NULL;
-
- /* check if the source display name matches one of the NAMES (when copying) */
- if (G_LIKELY (mode == THUNAR_VFS_XFER_COPY))
- {
- /* allocate memory for the new name */
- tmp_name = g_strdup (source_display_name);
-
- /* try the NAMES */
- for (m = 0; m < 3; ++m)
- if (sscanf (source_display_name, gettext (NAMES[m][THUNAR_VFS_XFER_COPY]), tmp_name) == 1)
- {
- /* swap tmp and source display name */
- swap_name = source_display_name;
- source_display_name = tmp_name;
- tmp_name = swap_name;
- break;
- }
-
- /* if we had no match on the NAMES, try the "%uth copy of %s" pattern */
- if (G_LIKELY (m == 3) && sscanf (source_display_name, _("%uth copy of %s"), &m, tmp_name) == 2)
- {
- /* swap tmp and source display name */
- swap_name = source_display_name;
- source_display_name = tmp_name;
- tmp_name = swap_name;
- }
-
- /* cleanup */
- g_free (tmp_name);
- }
-
- /* determine the target display name */
- if (G_LIKELY (n <= 3))
- target_display_name = g_strdup_printf (gettext (NAMES[n - 1][mode]), source_display_name);
- else if (mode == THUNAR_VFS_XFER_COPY)
- target_display_name = g_strdup_printf (ngettext ("%uth copy of %s", "%uth copy of %s", n), n, source_display_name);
- else
- target_display_name = g_strdup_printf (ngettext ("%uth link to %s", "%uth link to %s", n), n, source_display_name);
-
- /* we don't need the source display name anymore */
- g_free (source_display_name);
-
- /* try to determine the real target name from the display name */
- target_name = g_filename_from_utf8 (target_display_name, -1, NULL, NULL, error);
-
- /* generate the target path */
- target_path = (target_name != NULL) ? thunar_vfs_path_relative (target_directory_path, target_name) : NULL;
- g_free (target_display_name);
- g_free (target_name);
- return target_path;
-}
-
-
-
-static inline gboolean
-thunar_vfs_xfer_copy_directory (const gchar *source_absolute_path,
- const gchar *target_absolute_path,
- const struct stat *source_statb,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- gboolean merge_directories,
- GError **error)
-{
- mode_t mode;
-
- /* default to the source dir permissions */
- mode = (source_statb->st_mode & ~S_IFMT);
-
- /* always make sure that we can write to newly created directories */
- mode |= (THUNAR_VFS_FILE_MODE_USR_READ | THUNAR_VFS_FILE_MODE_USR_WRITE);
-
- /* check if the directory exists */
- if (g_file_test (target_absolute_path, G_FILE_TEST_IS_DIR))
- {
- /* return an error if we should not merge */
- if (G_UNLIKELY (!merge_directories))
- {
- errno = EEXIST;
- goto error;
- }
- }
- else if (g_mkdir (target_absolute_path, mode) < 0)
- {
-error:
- /* setup the error return */
- tvxc_set_error_from_errno (error, _("Failed to create directory \"%s\""), target_absolute_path);
- return FALSE;
- }
-
- /* invoke the callback */
- (*callback) (source_statb->st_size, source_statb->st_size, user_data);
-
- return TRUE;
-}
-
-
-
-static inline gboolean
-thunar_vfs_xfer_copy_fifo (const gchar *source_absolute_path,
- const gchar *target_absolute_path,
- const struct stat *source_statb,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- GError **error)
-{
-#ifdef HAVE_MKFIFO
- /* try to create the named fifo */
- if (mkfifo (target_absolute_path, source_statb->st_mode) < 0)
- {
- /* TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'. */
- tvxc_set_error_from_errno (error, _("Failed to create named fifo \"%s\""), target_absolute_path);
- return FALSE;
- }
-
- /* invoke the callback */
- (*callback) (source_statb->st_size, source_statb->st_size, user_data);
-
- return TRUE;
-#else
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Named pipes are not supported"));
- return FALSE;
-#endif
-}
-
-
-
-static inline gboolean
-thunar_vfs_xfer_copy_regular (const gchar *source_absolute_path,
- const gchar *target_absolute_path,
- const struct stat *source_statb,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- GError **error)
-{
- gboolean succeed = FALSE;
- mode_t mode;
- gsize done;
- gsize bufsize;
- gchar *buffer;
- gint source_fd;
- gint target_fd;
- gint n, m, l;
-
- /* try to open the source file for reading */
- source_fd = g_open (source_absolute_path, O_RDONLY, 0000);
- if (G_UNLIKELY (source_fd < 0))
- {
- tvxc_set_error_from_errno (error, _("Failed to open \"%s\" for reading"), source_absolute_path);
- goto end0;
- }
-
- /* default to the permissions of the source file */
- mode = source_statb->st_mode;
-
- /* if the source is located on a rdonly medium or we are not the owner
- * of the source file, we automatically chmod +rw the destination file.
- */
- if (tvxc_mounted_readonly (source_fd) || source_statb->st_uid != getuid ())
- mode |= (THUNAR_VFS_FILE_MODE_USR_READ | THUNAR_VFS_FILE_MODE_USR_WRITE);
-
- /* try to open the target file for writing */
- target_fd = g_open (target_absolute_path, O_CREAT | O_EXCL | O_NOFOLLOW | O_WRONLY, mode);
- if (G_UNLIKELY (target_fd < 0))
- {
- /* translate EISDIR, EMLINK and ETXTBSY to EEXIST */
- if (G_UNLIKELY (errno == EISDIR || errno == EMLINK || errno == ETXTBSY))
- errno = EEXIST;
-
- /* EEXIST gets a better error message */
- if (G_LIKELY (errno == EEXIST))
- {
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
- _("The file \"%s\" already exists"), target_absolute_path);
- }
- else
- {
- /* use the generic error message */
- tvxc_set_error_from_errno (error, _("Failed to open \"%s\" for writing"), target_absolute_path);
- }
-
- goto end1;
- }
-
- /* allocate the transfer buffer */
- bufsize = 8 * source_statb->st_blksize;
- buffer = g_new (gchar, bufsize);
-
- /* copy the data from the source file to the target file */
- for (done = 0; done < source_statb->st_size; )
- {
- /* read a chunk from the source file */
- n = read (source_fd, buffer, bufsize);
- if (G_UNLIKELY (n < 0))
- {
- /* just try again on EAGAIN/EINTR */
- if (G_UNLIKELY (errno == EAGAIN || errno == EINTR))
- continue;
-
- tvxc_set_error_from_errno (error, _("Failed to read data from \"%s\""), source_absolute_path);
- goto end2;
- }
- else if (n == 0)
- break;
-
- /* write the data to the target file */
- for (m = 0; m < n; )
- {
- l = write (target_fd, buffer + m, n - m);
- if (G_UNLIKELY (l < 0))
- {
- /* just try again on EAGAIN/EINTR */
- if (G_UNLIKELY (errno == EAGAIN || errno == EINTR))
- continue;
-
- tvxc_set_error_from_errno (error, _("Failed to write data to \"%s\""), target_absolute_path);
- goto end2;
- }
- else
- {
- /* advance the offset */
- m += l;
- }
- }
-
- /* advance the byte offset */
- done += n;
-
- /* invoke the callback (FALSE means cancel) */
- if (!((*callback) (source_statb->st_size, done, user_data)))
- {
- /* unlink the not yet completely written target file */
- if (done < source_statb->st_size && g_unlink (target_absolute_path) < 0)
- {
- tvxc_set_error_from_errno (error, _("Failed to remove \"%s\""), target_absolute_path);
- goto end2;
- }
-
- /* tell the caller that the job was cancelled */
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INTR, _("Operation canceled"));
- goto end2;
- }
- }
-
- /* invoke the callback with the fully written data */
- (*callback) (done, done, user_data);
-
- /* we did it */
- succeed = TRUE;
-
- /* release the transfer buffer */
-end2:
- g_free (buffer);
-
- /* close the file descriptors */
- close (target_fd);
-end1:
- close (source_fd);
-end0:
- return succeed;
-}
-
-
-
-static inline gboolean
-thunar_vfs_xfer_copy_symlink (const gchar *source_absolute_path,
- const gchar *target_absolute_path,
- const struct stat *source_statb,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- GError **error)
-{
-#if defined(HAVE_SYMLINK) && defined(HAVE_READLINK)
- gchar link_target[THUNAR_VFS_PATH_MAXSTRLEN * 2 + 1];
- gint link_target_len;
-
- /* try to read the link target */
- link_target_len = readlink (source_absolute_path, link_target, sizeof (link_target) - 1);
- if (G_UNLIKELY (link_target_len < 0))
- {
- tvxc_set_error_from_errno (error, _("Failed to read link target from \"%s\""), source_absolute_path);
- return FALSE;
- }
- link_target[link_target_len] = '\0';
-
- /* try to create the symbolic link */
- if (symlink (link_target, target_absolute_path) < 0)
- {
- tvxc_set_error_from_errno (error, _("Failed to create symbolic link \"%s\""), target_absolute_path);
- return FALSE;
- }
-
-#ifdef HAVE_LCHMOD
- /* apply the file mode which was found for the source */
- if (lchmod (target_absolute_path, source_statb->st_mode) < 0)
- {
- tvxc_set_error_from_errno (error, _("Failed to change mode of \"%s\""), target_absolute_path);
- return FALSE;
- }
-#endif
-
- /* invoke the callback */
- (*callback) (source_statb->st_size, source_statb->st_size, user_data);
-
- return TRUE;
-#else
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Symbolic links are not supported"));
- return FALSE;
-#endif
-}
-
-
-
-static gboolean
-thunar_vfs_xfer_copy_internal (const ThunarVfsPath *source_path,
- ThunarVfsPath *target_path,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- gboolean merge_directories,
- GError **error)
-{
- struct stat source_statb;
- gboolean succeed;
- gchar *display_name;
- gchar source_absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
- gchar target_absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
-
- /* determine the absolute path to the source file */
- if (thunar_vfs_path_to_string (source_path, source_absolute_path, sizeof (source_absolute_path), error) < 0)
- return FALSE;
-
- /* stat the source path */
- if (g_lstat (source_absolute_path, &source_statb) < 0)
- {
- tvxc_set_error_from_errno (error, _("Failed to determine file info for \"%s\""), source_absolute_path);
- return FALSE;
- }
-
- /* determine the absolute path to the target file */
- if (thunar_vfs_path_to_string (target_path, target_absolute_path, sizeof (target_absolute_path), error) < 0)
- return FALSE;
-
- /* perform the appropriate operation */
- switch ((source_statb.st_mode & S_IFMT) >> 12)
- {
- case THUNAR_VFS_FILE_TYPE_DIRECTORY:
- succeed = thunar_vfs_xfer_copy_directory (source_absolute_path, target_absolute_path, &source_statb, callback, user_data, merge_directories, error);
- break;
-
- case THUNAR_VFS_FILE_TYPE_FIFO:
- succeed = thunar_vfs_xfer_copy_fifo (source_absolute_path, target_absolute_path, &source_statb, callback, user_data, error);
- break;
-
- case THUNAR_VFS_FILE_TYPE_REGULAR:
- succeed = thunar_vfs_xfer_copy_regular (source_absolute_path, target_absolute_path, &source_statb, callback, user_data, error);
- break;
-
- case THUNAR_VFS_FILE_TYPE_SYMLINK:
- succeed = thunar_vfs_xfer_copy_symlink (source_absolute_path, target_absolute_path, &source_statb, callback, user_data, error);
- break;
-
- default:
- display_name = g_filename_display_name (source_absolute_path);
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Failed to copy special file \"%s\""), display_name);
- g_free (display_name);
- return FALSE;
- }
-
- /* schedule a "created" event if the operation was successfull */
- if (G_LIKELY (succeed))
- thunar_vfs_monitor_feed (thunar_vfs_xfer_monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, target_path);
-
- /* and that's it */
- return succeed;
-}
-
-
-
-static inline gboolean
-thunar_vfs_xfer_link_internal (const ThunarVfsPath *source_path,
- ThunarVfsPath *target_path,
- GError **error)
-{
-#ifdef HAVE_SYMLINK
- struct stat source_statb;
- gchar source_absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
- gchar target_absolute_path[THUNAR_VFS_PATH_MAXSTRLEN];
-
- /* determine the absolute path to the source file */
- if (thunar_vfs_path_to_string (source_path, source_absolute_path, sizeof (source_absolute_path), error) < 0)
- return FALSE;
-
- /* stat the source path */
- if (g_lstat (source_absolute_path, &source_statb) < 0)
- {
- tvxc_set_error_from_errno (error, _("Failed to determine file info for \"%s\""), source_absolute_path);
- return FALSE;
- }
-
- /* determine the absolute path to the target file */
- if (thunar_vfs_path_to_string (target_path, target_absolute_path, sizeof (target_absolute_path), error) < 0)
- return FALSE;
-
- /* try to create the symlink */
- if (symlink (source_absolute_path, target_absolute_path) < 0)
- {
- tvxc_set_error_from_errno (error, _("Failed to create symbolic link \"%s\""), target_absolute_path);
- return FALSE;
- }
-
- /* feed a "created" event for the target path */
- thunar_vfs_monitor_feed (thunar_vfs_xfer_monitor, THUNAR_VFS_MONITOR_EVENT_CREATED, target_path);
-
- return TRUE;
-#else
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Symbolic links are not supported"));
- return FALSE;
-#endif
-}
-
-
-
-/**
- * thunar_vfs_xfer_copy:
- * @source_path : the #ThunarVfsPath to the source file.
- * @target_path : the #ThunarVfsPath to the target file.
- * @target_path_return : return location for the final target path or %NULL.
- * @callback : progress callback function.
- * @user_data : additional user data to pass to @callback.
- * @error : return location for errors or %NULL.
- *
- * If @target_path_return is not %NULL, the final target path, which
- * may be different than @target_path, is placed in the location
- * pointed to by @target_path_return. The caller is responsible to
- * free the object using thunar_vfs_path_unref(). @target_path_return
- * will only be set if %TRUE is returned.
- *
- * As a special case, if @callback returns %FALSE (which means the
- * operation should be cancelled), this method returns %FALSE and
- * @error is set to #G_FILE_ERROR_INTR.
- *
- * Return value: %FALSE if @error is set, else %TRUE.
- **/
-gboolean
-thunar_vfs_xfer_copy (const ThunarVfsPath *source_path,
- ThunarVfsPath *target_path,
- ThunarVfsPath **target_path_return,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- GError **error)
-{
- ThunarVfsPath *target_directory_path;
- ThunarVfsPath *path;
- gboolean succeed;
- GError *err = NULL;
- guint n;
-
- g_return_val_if_fail (source_path != NULL, FALSE);
- g_return_val_if_fail (target_path != NULL, FALSE);
- g_return_val_if_fail (callback != NULL, FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
- /* check if source and target are the same */
- if (G_LIKELY (!thunar_vfs_path_equal (source_path, target_path)))
- {
- succeed = thunar_vfs_xfer_copy_internal (source_path, target_path, callback, user_data, TRUE, error);
- if (G_LIKELY (succeed && target_path_return != NULL))
- *target_path_return = thunar_vfs_path_ref (target_path);
- return succeed;
- }
-
- /* generate a duplicate name for the target path */
- target_directory_path = thunar_vfs_path_get_parent (target_path);
- for (n = 1;; ++n)
- {
- /* try to generate the next duplicate path */
- path = thunar_vfs_xfer_next_path (source_path, target_directory_path, n, THUNAR_VFS_XFER_COPY, &err);
- if (G_UNLIKELY (path == NULL))
- {
- g_propagate_error (error, err);
- return FALSE;
- }
-
- /* try to copy to the duplicate file */
- succeed = thunar_vfs_xfer_copy_internal (source_path, path, callback, user_data, FALSE, &err);
-
- /* check if we succeed or cannot continue */
- if (G_LIKELY (succeed || err->domain != G_FILE_ERROR || err->code != G_FILE_ERROR_EXIST))
- {
- if (G_LIKELY (succeed && target_path_return != NULL))
- *target_path_return = path;
- else
- thunar_vfs_path_unref (path);
-
- if (G_UNLIKELY (error == NULL))
- g_clear_error (&err);
- else
- *error = err;
- return succeed;
- }
-
- /* and once again... */
- thunar_vfs_path_unref (path);
- g_clear_error (&err);
- }
-
- /* we never get here */
- g_assert_not_reached ();
- return FALSE;
-}
-
-
-
-/**
- * thunar_vfs_xfer_link:
- * @source_path : the #ThunarVfsPath to the source file.
- * @target_path : the #ThunarVfsPath to the target file.
- * @target_path_return : return location for the final target path or %NULL.
- * @error : return location for errors or %NULL.
- *
- * If @target_path_return is not %NULL, the final target path, which
- * may be different than @target_path, is placed in the location
- * pointed to by @target_path_return. The caller is responsible to
- * free the object using thunar_vfs_path_unref(). @target_path_return
- * will only be set if %TRUE is returned.
- *
- * Return value: %FALSE if @error is set, else %TRUE.
- **/
-gboolean
-thunar_vfs_xfer_link (const ThunarVfsPath *source_path,
- ThunarVfsPath *target_path,
- ThunarVfsPath **target_path_return,
- GError **error)
-{
- ThunarVfsPath *target_directory_path;
- ThunarVfsPath *path;
- gboolean succeed;
- GError *err = NULL;
- guint n;
-
- g_return_val_if_fail (source_path != NULL, FALSE);
- g_return_val_if_fail (target_path != NULL, FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
- /* check if source and target are the same */
- if (G_LIKELY (!thunar_vfs_path_equal (source_path, target_path)))
- {
- succeed = thunar_vfs_xfer_link_internal (source_path, target_path, error);
- if (G_LIKELY (succeed && target_path_return != NULL))
- *target_path_return = thunar_vfs_path_ref (target_path);
- return succeed;
- }
-
- /* generate a new link name for the target path */
- target_directory_path = thunar_vfs_path_get_parent (target_path);
- for (n = 1;; ++n)
- {
- /* try to generate the next link path */
- path = thunar_vfs_xfer_next_path (source_path, target_directory_path, n, THUNAR_VFS_XFER_LINK, &err);
- if (G_UNLIKELY (path == NULL))
- {
- g_propagate_error (error, err);
- return FALSE;
- }
-
- /* try to symlink to the new file */
- succeed = thunar_vfs_xfer_link_internal (source_path, path, &err);
-
- /* check if we succeed or cannot continue */
- if (G_LIKELY (succeed || err->domain != G_FILE_ERROR || err->code != G_FILE_ERROR_EXIST))
- {
- if (G_LIKELY (succeed && target_path_return != NULL))
- *target_path_return = path;
- else
- thunar_vfs_path_unref (path);
-
- if (G_UNLIKELY (error == NULL))
- g_clear_error (&err);
- else
- *error = err;
- return succeed;
- }
-
- /* and once again... */
- thunar_vfs_path_unref (path);
- g_clear_error (&err);
- }
-
- /* we never get here */
- g_assert_not_reached ();
- return FALSE;
-}
-
-
-
-/**
- * _thunar_vfs_xfer_init:
- * Initializes the Thunar-VFS Transfer module.
- **/
-void
-_thunar_vfs_xfer_init (void)
-{
- thunar_vfs_xfer_monitor = thunar_vfs_monitor_get_default ();
-}
-
-
-
-/**
- * _thunar_vfs_xfer_shutdown:
- * Shuts down the Thunar-VFS Transfer module.
- **/
-void
-_thunar_vfs_xfer_shutdown (void)
-{
- g_object_unref (G_OBJECT (thunar_vfs_xfer_monitor));
- thunar_vfs_xfer_monitor = NULL;
-}
-
-
-
-#define __THUNAR_VFS_XFER_C__
-#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-xfer.h b/thunar-vfs/thunar-vfs-xfer.h
deleted file mode 100644
index facdfab95539b130dfa1c9883cc851e982bf12f3..0000000000000000000000000000000000000000
--- a/thunar-vfs/thunar-vfs-xfer.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
-#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef __THUNAR_VFS_XFER_H__
-#define __THUNAR_VFS_XFER_H__
-
-#include <thunar-vfs/thunar-vfs-path.h>
-#include <thunar-vfs/thunar-vfs-types.h>
-
-G_BEGIN_DECLS;
-
-/**
- * ThunarVfsXferCallback:
- * @total_size : the total size of the file system entity.
- * @completed_size : the completed size of the file system entity.
- * @user_data : the user data specified when thunar_vfs_xfer_copy()
- * was called.
- *
- * Return value: %FALSE to cancel the transfer operation,
- * %TRUE to continue.
- **/
-typedef gboolean (*ThunarVfsXferCallback) (ThunarVfsFileSize total_size,
- ThunarVfsFileSize completed_size,
- gpointer user_data);
-
-gboolean thunar_vfs_xfer_copy (const ThunarVfsPath *source_path,
- ThunarVfsPath *target_path,
- ThunarVfsPath **target_path_return,
- ThunarVfsXferCallback callback,
- gpointer user_data,
- GError **error) G_GNUC_INTERNAL;
-
-gboolean thunar_vfs_xfer_link (const ThunarVfsPath *source_path,
- ThunarVfsPath *target_path,
- ThunarVfsPath **target_path_return,
- GError **error) G_GNUC_INTERNAL;
-
-
-#if defined(THUNAR_VFS_COMPILATION)
-void _thunar_vfs_xfer_init (void) G_GNUC_INTERNAL;
-void _thunar_vfs_xfer_shutdown (void) G_GNUC_INTERNAL;
-#endif
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_VFS_XFER_H__ */
diff --git a/thunar-vfs/thunar-vfs.c b/thunar-vfs/thunar-vfs.c
index 6e7d0dee495923acf51ee655c39a3b8712e5768b..8632e537e5c8d59dbe5e5fb153dc33212c7167fb 100644
--- a/thunar-vfs/thunar-vfs.c
+++ b/thunar-vfs/thunar-vfs.c
@@ -22,17 +22,20 @@
#include <config.h>
#endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
#include <thunar-vfs/thunar-vfs.h>
-#include <thunar-vfs/thunar-vfs-chmod-job.h>
-#include <thunar-vfs/thunar-vfs-chown-job.h>
-#include <thunar-vfs/thunar-vfs-creat-job.h>
#include <thunar-vfs/thunar-vfs-deep-count-job.h>
-#include <thunar-vfs/thunar-vfs-link-job.h>
-#include <thunar-vfs/thunar-vfs-listdir-job.h>
-#include <thunar-vfs/thunar-vfs-mkdir-job.h>
+#include <thunar-vfs/thunar-vfs-io-jobs.h>
+#include <thunar-vfs/thunar-vfs-io-trash.h>
+#include <thunar-vfs/thunar-vfs-job-private.h>
+#include <thunar-vfs/thunar-vfs-mime-database-private.h>
+#include <thunar-vfs/thunar-vfs-monitor-private.h>
+#include <thunar-vfs/thunar-vfs-private.h>
+#include <thunar-vfs/thunar-vfs-simple-job.h>
#include <thunar-vfs/thunar-vfs-transfer-job.h>
-#include <thunar-vfs/thunar-vfs-unlink-job.h>
-#include <thunar-vfs/thunar-vfs-xfer.h>
#include <thunar-vfs/thunar-vfs-alias.h>
@@ -58,11 +61,21 @@ thunar_vfs_init (void)
/* initialize the path module */
_thunar_vfs_path_init ();
- /* initialize the xfer module */
- _thunar_vfs_xfer_init ();
+ /* allocate the shared monitor instance */
+ _thunar_vfs_monitor = g_object_new (THUNAR_VFS_TYPE_MONITOR, NULL);
+
+ /* allocate the shared mime database instance */
+ _thunar_vfs_mime_database = g_object_new (THUNAR_VFS_TYPE_MIME_DATABASE, NULL);
- /* initialize the info module */
- _thunar_vfs_info_init ();
+ /* pre-determine the most important mime types */
+ _thunar_vfs_mime_inode_directory = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "inode/directory");
+ _thunar_vfs_mime_application_x_desktop = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "application/x-desktop");
+ _thunar_vfs_mime_application_x_executable = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "application/x-executable");
+ _thunar_vfs_mime_application_x_shellscript = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "application/x-shellscript");
+ _thunar_vfs_mime_application_octet_stream = thunar_vfs_mime_database_get_info (_thunar_vfs_mime_database, "application/octet-stream");
+
+ /* initialize the trash subsystem */
+ _thunar_vfs_io_trash_init ();
/* initialize the jobs framework */
_thunar_vfs_job_init ();
@@ -84,11 +97,23 @@ thunar_vfs_shutdown (void)
/* shutdown the jobs framework */
_thunar_vfs_job_shutdown ();
- /* release the info module */
- _thunar_vfs_info_shutdown ();
+ /* shutdown the trash subsystem */
+ _thunar_vfs_io_trash_shutdown ();
+
+ /* release the mime type references */
+ thunar_vfs_mime_info_unref (_thunar_vfs_mime_application_octet_stream);
+ thunar_vfs_mime_info_unref (_thunar_vfs_mime_application_x_shellscript);
+ thunar_vfs_mime_info_unref (_thunar_vfs_mime_application_x_executable);
+ thunar_vfs_mime_info_unref (_thunar_vfs_mime_application_x_desktop);
+ thunar_vfs_mime_info_unref (_thunar_vfs_mime_inode_directory);
+
+ /* release the reference on the mime database */
+ g_object_unref (G_OBJECT (_thunar_vfs_mime_database));
+ _thunar_vfs_mime_database = NULL;
- /* shutdown the xfer module */
- _thunar_vfs_xfer_shutdown ();
+ /* release the reference on the monitor */
+ g_object_unref (G_OBJECT (_thunar_vfs_monitor));
+ _thunar_vfs_monitor = NULL;
/* shutdown the path module */
_thunar_vfs_path_shutdown ();
@@ -102,27 +127,26 @@ thunar_vfs_shutdown (void)
* @path : the #ThunarVfsPath for the folder that should be listed.
* @error : return location for errors or %NULL.
*
- * Generates a #ThunarVfsListdirJob, which can be used to list the
- * contents of a directory (as specified by @path). If the creation
- * of the job failes for some reason, %NULL will be returned and
- * @error will be set to point to a #GError describing the cause.
- * Else the newly allocated #ThunarVfsListdirJob will be returned
- * and the caller is responsible to call g_object_unref().
+ * Generates a #ThunarVfsJob, which lists the contents of the folder
+ * at the specified @path. If the job could not be launched for
+ * some reason, %NULL will be returned and @error will be set to
+ * point to a #GError describing the cause. Otherwise the newly
+ * allocated #ThunarVfsJob will be returned and the caller is
+ * responsible to call g_object_unref().
*
* Note, that the returned job is launched right away, so you
* don't need to call thunar_vfs_job_launch() on it.
*
- * Return value: the newly allocated #ThunarVfsListdirJob or %NULL
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
* if an error occurs while creating the job.
**/
ThunarVfsJob*
thunar_vfs_listdir (ThunarVfsPath *path,
GError **error)
{
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- /* allocate the job */
- return thunar_vfs_job_launch (thunar_vfs_listdir_job_new (path));
+ /* allocate and launch the listdir job */
+ return thunar_vfs_simple_job_launch (_thunar_vfs_io_jobs_listdir, 1,
+ THUNAR_VFS_TYPE_PATH, path);
}
@@ -132,7 +156,7 @@ thunar_vfs_listdir (ThunarVfsPath *path,
* @path : the #ThunarVfsPath of the file to create.
* @error : return location for errors or %NULL.
*
- * Allocates a new #ThunarVfsCreateJob, which creates a new
+ * Allocates a new #ThunarVfsJob, which creates a new empty
* file at @path.
*
* The caller is responsible to free the returned job using
@@ -141,8 +165,8 @@ thunar_vfs_listdir (ThunarVfsPath *path,
* Note that the returned job is launched right away, so you
* don't need to call thunar_vfs_job_launch() on it.
*
- * Return value: the newly allocated #ThunarVfsCreateJob or
- * %NULL if an error occurs while creating the job.
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
+ * if an error occurs while creating the job.
**/
ThunarVfsJob*
thunar_vfs_create_file (ThunarVfsPath *path,
@@ -169,8 +193,8 @@ thunar_vfs_create_file (ThunarVfsPath *path,
* @path_list : a list of #ThunarVfsPath<!---->s for files to create.
* @error : return location for errors or %NULL.
*
- * Allocates a new #ThunarVfsCreateJob, which creates new
- * files for all #ThunarVfsPath<!---->s in @path_list.
+ * Allocates a new #ThunarVfsJob which creates new empty files for all
+ * #ThunarVfsPath<!---->s in @path_list.
*
* The caller is responsible to free the returned job using
* g_object_unref() when no longer needed.
@@ -178,23 +202,22 @@ thunar_vfs_create_file (ThunarVfsPath *path,
* Note that the returned job is launched right away, so you
* don't need to call thunar_vfs_job_launch() on it.
*
- * Return value: the newly allocated #ThunarVfsCreateJob or
- * %NULL if an error occurs while creating the job.
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
+ * if an error occurs while creating the job.
**/
ThunarVfsJob*
thunar_vfs_create_files (GList *path_list,
GError **error)
{
- ThunarVfsJob *job;
-
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- /* allocate/launch the job */
- job = thunar_vfs_creat_job_new (path_list, error);
- if (G_LIKELY (job != NULL))
- thunar_vfs_job_launch (job);
+ /* verify that we have only local paths here */
+ if (!_thunar_vfs_check_only_local (path_list, error))
+ return NULL;
- return job;
+ /* allocate and launch the create job */
+ return thunar_vfs_simple_job_launch (_thunar_vfs_io_jobs_create, 1,
+ THUNAR_VFS_TYPE_PATH_LIST, path_list);
}
@@ -289,7 +312,7 @@ thunar_vfs_copy_files (GList *source_path_list,
* @target_path : the target #ThunarVfsPath.
* @error : return location for errors or %NULL.
*
- * Allocates a new #ThunarVfsLinkJob, which creates a symbolic
+ * Allocates a new #ThunarVfsJob, which creates a symbolic
* link from @source_path to @target_path.
*
* If @source_path and @target_path refer to the same file,
@@ -301,7 +324,7 @@ thunar_vfs_copy_files (GList *source_path_list,
* Note, that the returned job is launched right away, so you don't
* need to call thunar_vfs_job_launch() on it.
*
- * Return value: the newly allocated #ThunarVfsLinkJob or %NULL
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
* if an error occurs while creating the job.
**/
ThunarVfsJob*
@@ -337,8 +360,12 @@ thunar_vfs_link_file (ThunarVfsPath *source_path,
* @target_path_list : list of #ThunarVfsPath<!---->s to the target files.
* @error : return location for errors or %NULL.
*
- * Like thunar_vfs_link_file(), but works on path lists, rather than
- * a single path.
+ * Like thunar_vfs_link_file(), but works on path lists, rather than a single
+ * path. The length of the @source_path_list and @target_path_list must match,
+ * otherwise the behaviour is undefined, but its likely to crash the application.
+ *
+ * Right now links can only be created from local files to local files (with
+ * path scheme %THUNAR_VFS_PATH_SCHEME_FILE).
*
* The caller is responsible to free the returned job using
* g_object_unref() when no longer needed.
@@ -346,7 +373,7 @@ thunar_vfs_link_file (ThunarVfsPath *source_path,
* Note, that the returned job is launched right away, so you don't
* need to call thunar_vfs_job_launch() on it.
*
- * Return value: the newly allocated #ThunarVfsLinkJob or %NULL
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
* if an error occurs while creating the job.
**/
ThunarVfsJob*
@@ -354,16 +381,13 @@ thunar_vfs_link_files (GList *source_path_list,
GList *target_path_list,
GError **error)
{
- ThunarVfsJob *job;
-
+ g_return_val_if_fail (g_list_length (source_path_list) == g_list_length (target_path_list), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- /* allocate/launch the job */
- job = thunar_vfs_link_job_new (source_path_list, target_path_list, error);
- if (G_LIKELY (job != NULL))
- thunar_vfs_job_launch (job);
-
- return job;
+ /* allocate and launch the job */
+ return thunar_vfs_simple_job_launch (_thunar_vfs_io_jobs_link, 2,
+ THUNAR_VFS_TYPE_PATH_LIST, source_path_list,
+ THUNAR_VFS_TYPE_PATH_LIST, target_path_list);
}
@@ -465,7 +489,7 @@ thunar_vfs_move_files (GList *source_path_list,
* is responsible to free the returned object using g_object_unref()
* when no longer needed.
*
- * Return value: the newly allocated #ThunarVfsUnlinkJob or %NULL
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
* if an error occurs while creating the job.
**/
ThunarVfsJob*
@@ -493,33 +517,25 @@ thunar_vfs_unlink_file (ThunarVfsPath *path,
* @path_list : a list of #ThunarVfsPath<!---->s, that should be unlinked.
* @error : return location for errors or %NULL.
*
- * Generates a #ThunarVfsInteractiveJob, which can be used to unlink
- * all files referenced by the @path_list. If the creation of the job
- * failes for some reason, %NULL will be returned and @error will
- * be set to point to a #GError describing the cause. Else, the
- * newly allocated #ThunarVfsUnlinkJob will be returned, and the
- * caller is responsible to call g_object_unref().
+ * Allocates a new #ThunarVfsJob which recursively unlinks all files
+ * referenced by the @path_list. If the job cannot be launched for
+ * some reason, %NULL will be returned and @error will be set to point to
+ * a #GError describing the cause. Else, the newly allocated #ThunarVfsJob
+ * will be returned, and the caller is responsible to free it using
+ * g_object_unref() when no longer needed.
*
* Note, that the returned job is launched right away, so you
* don't need to call thunar_vfs_job_launch() on it.
*
- * Return value: the newly allocated #ThunarVfsUnlinkJob or %NULL
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
* if an error occurs while creating the job.
**/
ThunarVfsJob*
thunar_vfs_unlink_files (GList *path_list,
GError **error)
{
- ThunarVfsJob *job;
-
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- /* try to allocate the job */
- job = thunar_vfs_unlink_job_new (path_list, error);
- if (G_LIKELY (job != NULL))
- thunar_vfs_job_launch (job);
-
- return job;
+ return thunar_vfs_simple_job_launch (_thunar_vfs_io_jobs_unlink, 1,
+ THUNAR_VFS_TYPE_PATH_LIST, path_list);
}
@@ -529,18 +545,9 @@ thunar_vfs_unlink_files (GList *path_list,
* @path : the #ThunarVfsPath to the directory to create.
* @error : return location for errors or %NULL.
*
- * Generates a #ThunarVfsMkdirJob, which can be used to
- * asynchronously create a new directory at the given @path. If
- * the creation of the job fails for some reason, %NULL will be
- * returned and @error will be set to point to a #GError
- * describing the cause of the problem. Else the newly allocated
- * #ThunarVfsMkdirJob will be returned, and the caller is responsible
- * to call g_object_unref().
- *
- * Note, that the returned job is launched right away, so you
- * don't need to call thunar_vfs_job_launch() on it.
+ * Simple wrapper for thunar_vfs_make_directories().
*
- * Return value: the newly allocated #ThunarVfsMkdirJob or %NULL
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
* if an error occurs while creating the job.
**/
ThunarVfsJob*
@@ -569,32 +576,32 @@ thunar_vfs_make_directory (ThunarVfsPath *path,
* to the directories which should be created.
* @error : return location for errors or %NULL.
*
- * Similar to thunar_vfs_make_directory(), but allows the creation
- * of multiple directories using a single #ThunarVfsJob.
- *
- * The caller is responsible to free the returned job using
- * g_object_unref() when no longer needed.
+ * Allocates a new #ThunarVfsJob to create new directories at all
+ * #ThunarVfsPath<!---->s specified in @path_list. Returns %NULL if
+ * the job could not be launched for some reason, and @error will be
+ * set to point to a #GError describing the cause. Otherwise the
+ * job will be returned and the caller is responsible to free the
+ * returned object using g_object_unref() when no longer needed.
*
* Note, that the returned job is launched right away, so you don't
* need to call thunar_vfs_job_launch() on it.
*
- * Return value: the newly allocated #ThunarVfsMkdirJob or %NULL
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
* if an error occurs while creating the job.
**/
ThunarVfsJob*
thunar_vfs_make_directories (GList *path_list,
GError **error)
{
- ThunarVfsJob *job;
-
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- /* allocate and launch the new job */
- job = thunar_vfs_mkdir_job_new (path_list, error);
- if (G_LIKELY (job != NULL))
- thunar_vfs_job_launch (job);
+ /* verify that we have only local paths here */
+ if (!_thunar_vfs_check_only_local (path_list, error))
+ return NULL;
- return job;
+ /* allocate and launch the mkdir job */
+ return thunar_vfs_simple_job_launch (_thunar_vfs_io_jobs_mkdir, 1,
+ THUNAR_VFS_TYPE_PATH_LIST, path_list);
}
@@ -615,7 +622,7 @@ thunar_vfs_make_directories (GList *path_list,
* Note, that the returned job is launched right away, so you don't
* need to call thunar_vfs_job_launch() on it.
*
- * Return value: the newly allocated #ThunarVfsChmodJob or %NULL
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
* if an error occurs while creating the job.
**/
ThunarVfsJob*
@@ -627,17 +634,31 @@ thunar_vfs_change_mode (ThunarVfsPath *path,
gboolean recursive,
GError **error)
{
- ThunarVfsJob *job;
+ GList path_list;
g_return_val_if_fail (path != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- /* allocate and launch the new job */
- job = thunar_vfs_chmod_job_new (path, dir_mask, dir_mode, file_mask, file_mode, recursive, error);
- if (G_LIKELY (job != NULL))
- thunar_vfs_job_launch (job);
+ /* verify that we have only local paths here */
+ if (G_UNLIKELY (!_thunar_vfs_path_is_local (path)))
+ {
+ _thunar_vfs_set_g_error_from_errno (error, EINVAL);
+ return NULL;
+ }
- return job;
+ /* fake a path list */
+ path_list.data = path;
+ path_list.next = NULL;
+ path_list.prev = NULL;
+
+ /* allocate and launch the new job */
+ return thunar_vfs_simple_job_launch (_thunar_vfs_io_jobs_chmod, 6,
+ THUNAR_VFS_TYPE_PATH_LIST, &path_list,
+ THUNAR_VFS_TYPE_VFS_FILE_MODE, dir_mask,
+ THUNAR_VFS_TYPE_VFS_FILE_MODE, dir_mode,
+ THUNAR_VFS_TYPE_VFS_FILE_MODE, file_mask,
+ THUNAR_VFS_TYPE_VFS_FILE_MODE, file_mode,
+ G_TYPE_BOOLEAN, recursive);
}
@@ -655,7 +676,7 @@ thunar_vfs_change_mode (ThunarVfsPath *path,
* Note, that the returned job is launched right away, so you don't
* need to call thunar_vfs_job_launch() on it.
*
- * Return value: the newly allocated #ThunarVfsChownJob or %NULL
+ * Return value: the newly allocated #ThunarVfsJob or %NULL
* if an error occurs while creating the job.
**/
ThunarVfsJob*
@@ -664,18 +685,30 @@ thunar_vfs_change_group (ThunarVfsPath *path,
gboolean recursive,
GError **error)
{
- ThunarVfsJob *job;
+ GList path_list;
+ g_return_val_if_fail (gid >= 0, NULL);
g_return_val_if_fail (path != NULL, NULL);
- g_return_val_if_fail ((gint) gid >= 0, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- /* allocate and launch the new job */
- job = thunar_vfs_chown_job_new (path, -1, gid, recursive, error);
- if (G_LIKELY (job != NULL))
- thunar_vfs_job_launch (job);
+ /* verify that we have only local paths here */
+ if (G_UNLIKELY (!_thunar_vfs_path_is_local (path)))
+ {
+ _thunar_vfs_set_g_error_from_errno (error, EINVAL);
+ return NULL;
+ }
- return job;
+ /* fake a path list */
+ path_list.data = path;
+ path_list.next = NULL;
+ path_list.prev = NULL;
+
+ /* allocate and launch the new job */
+ return thunar_vfs_simple_job_launch (_thunar_vfs_io_jobs_chown, 4,
+ THUNAR_VFS_TYPE_PATH_LIST, &path_list,
+ G_TYPE_INT, (gint) -1,
+ G_TYPE_INT, (gint) gid,
+ G_TYPE_BOOLEAN, recursive);
}
@@ -702,18 +735,30 @@ thunar_vfs_change_owner (ThunarVfsPath *path,
gboolean recursive,
GError **error)
{
- ThunarVfsJob *job;
+ GList path_list;
+ g_return_val_if_fail (uid >= 0, NULL);
g_return_val_if_fail (path != NULL, NULL);
- g_return_val_if_fail ((gint) uid >= 0, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- /* allocate and launch the new job */
- job = thunar_vfs_chown_job_new (path, uid, -1, recursive, error);
- if (G_LIKELY (job != NULL))
- thunar_vfs_job_launch (job);
+ /* verify that we have only local paths here */
+ if (G_UNLIKELY (!_thunar_vfs_path_is_local (path)))
+ {
+ _thunar_vfs_set_g_error_from_errno (error, EINVAL);
+ return NULL;
+ }
- return job;
+ /* fake a path list */
+ path_list.data = path;
+ path_list.next = NULL;
+ path_list.prev = NULL;
+
+ /* allocate and launch the new job */
+ return thunar_vfs_simple_job_launch (_thunar_vfs_io_jobs_chown, 4,
+ THUNAR_VFS_TYPE_PATH_LIST, &path_list,
+ G_TYPE_INT, (gint) uid,
+ G_TYPE_INT, (gint) -1,
+ G_TYPE_BOOLEAN, recursive);
}
diff --git a/thunar-vfs/thunar-vfs.symbols b/thunar-vfs/thunar-vfs.symbols
index e5d6f122bb2b3a2e4c13c8abe24c3c15f10f3516..137e205c5cadc70a908e9fb19234d028e4b795a6 100644
--- a/thunar-vfs/thunar-vfs.symbols
+++ b/thunar-vfs/thunar-vfs.symbols
@@ -83,15 +83,16 @@ thunar_vfs_info_copy G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
thunar_vfs_info_get_custom_icon
#endif
thunar_vfs_info_get_free_space
+thunar_vfs_info_get_metadata G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
+#ifdef INCLUDE_INTERNAL_SYMBOLS
thunar_vfs_info_read_link G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
+#endif
thunar_vfs_info_execute
thunar_vfs_info_rename
thunar_vfs_info_matches
-#ifdef INCLUDE_INTERNAL_SYMBOLS
thunar_vfs_info_list_free
#endif
#endif
-#endif
/* thunar-vfs-enum-types functions */
#if IN_HEADER(__THUNAR_VFS_ENUM_TYPES_H__)
@@ -100,7 +101,7 @@ thunar_vfs_deep_count_flags_get_type G_GNUC_CONST
thunar_vfs_file_flags_get_type G_GNUC_CONST
thunar_vfs_file_mode_get_type G_GNUC_CONST
thunar_vfs_file_type_get_type G_GNUC_CONST
-thunar_vfs_interactive_job_response_get_type G_GNUC_CONST
+thunar_vfs_job_response_get_type G_GNUC_CONST
thunar_vfs_mime_handler_flags_get_type G_GNUC_CONST
thunar_vfs_monitor_event_get_type G_GNUC_CONST
thunar_vfs_thumb_size_get_type G_GNUC_CONST
@@ -112,6 +113,7 @@ thunar_vfs_volume_status_get_type G_GNUC_CONST
/* ThunarVfsInteractiveJob methods */
#if IN_HEADER(__THUNAR_VFS_INTERACTIVE_JOB_H__)
#if IN_SOURCE(__THUNAR_VFS_INTERACTIVE_JOB_C__)
+thunar_vfs_interactive_job_response_get_type G_GNUC_CONST
thunar_vfs_interactive_job_get_type G_GNUC_CONST
#endif
#endif
@@ -199,11 +201,9 @@ thunar_vfs_mime_info_get_subtype G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
thunar_vfs_mime_info_hash
thunar_vfs_mime_info_equal
thunar_vfs_mime_info_lookup_icon_name
-#ifdef INCLUDE_INTERNAL_SYMBOLS
thunar_vfs_mime_info_list_free
#endif
#endif
-#endif
/* ThunarVfsMonitor methods */
#if IN_HEADER(__THUNAR_VFS_MONITOR_H__)
@@ -222,9 +222,11 @@ thunar_vfs_monitor_wait
#if IN_HEADER(__THUNAR_VFS_PATH_H__)
#if IN_SOURCE(__THUNAR_VFS_PATH_C__)
thunar_vfs_path_get_type G_GNUC_CONST
+thunar_vfs_path_list_get_type G_GNUC_CONST
thunar_vfs_path_new G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
thunar_vfs_path_get_for_home G_GNUC_WARN_UNUSED_RESULT
thunar_vfs_path_get_for_root G_GNUC_WARN_UNUSED_RESULT
+thunar_vfs_path_get_for_trash G_GNUC_WARN_UNUSED_RESULT
#ifdef INCLUDE_INTERNAL_SYMBOLS
thunar_vfs_path_ref
#endif
@@ -238,6 +240,7 @@ thunar_vfs_path_is_home
thunar_vfs_path_is_root
thunar_vfs_path_get_name
thunar_vfs_path_get_parent
+thunar_vfs_path_get_scheme
#endif
thunar_vfs_path_dup_string G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
thunar_vfs_path_to_string
@@ -248,11 +251,11 @@ thunar_vfs_path_list_to_string G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
#ifdef INCLUDE_INTERNAL_SYMBOLS
thunar_vfs_path_list_append G_GNUC_WARN_UNUSED_RESULT
thunar_vfs_path_list_prepend G_GNUC_WARN_UNUSED_RESULT
+#endif
thunar_vfs_path_list_copy G_GNUC_WARN_UNUSED_RESULT
thunar_vfs_path_list_free
#endif
#endif
-#endif
/* ThunarVfsThumbFactory methods */
#if IN_HEADER(__THUNAR_VFS_THUMB_H__)
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 49e9b78f13f682b0bbbb829030fe340352ee8418..59a44222468774fb23fca228ff375db5083932da 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -118,6 +118,7 @@ Thunar_SOURCES = \
thunar-preferences-dialog.h \
thunar-preferences.c \
thunar-preferences.h \
+ thunar-private.h \
thunar-progress-dialog.c \
thunar-progress-dialog.h \
thunar-properties-dialog.c \
@@ -173,6 +174,8 @@ Thunar_SOURCES = \
thunar-tree-pane.h \
thunar-tree-view.c \
thunar-tree-view.h \
+ thunar-util.c \
+ thunar-util.h \
thunar-view.c \
thunar-view.h \
thunar-window.c \
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 19c392fb2e650cd93745266e7934f7521995e60d..6099dc631a35001946940a314ee9b862bb0d0860 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -22,6 +22,12 @@
#include <config.h>
#endif
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
#ifdef HAVE_TIME_H
#include <time.h>
#endif
@@ -32,6 +38,7 @@
#include <thunar/thunar-preferences.h>
#include <thunar/thunar-progress-dialog.h>
#include <thunar/thunar-renamer-dialog.h>
+#include <thunar/thunar-util.h>
@@ -63,7 +70,7 @@ static void thunar_application_set_property (GObject
const GValue *value,
GParamSpec *pspec);
static void thunar_application_collect_and_launch (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
const gchar *icon_name,
const gchar *title,
Launcher launcher,
@@ -71,7 +78,7 @@ static void thunar_application_collect_and_launch (ThunarApplication
ThunarVfsPath *target_path,
GClosure *new_files_closure);
static void thunar_application_launch (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
const gchar *icon_name,
const gchar *title,
Launcher launcher,
@@ -276,7 +283,7 @@ thunar_application_set_property (GObject *object,
static void
thunar_application_collect_and_launch (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
const gchar *icon_name,
const gchar *title,
Launcher launcher,
@@ -284,9 +291,12 @@ thunar_application_collect_and_launch (ThunarApplication *application,
ThunarVfsPath *target_path,
GClosure *new_files_closure)
{
+ ThunarVfsInfo *info;
ThunarVfsPath *path;
GList *target_path_list = NULL;
GList *lp;
+ gchar *original_path;
+ gchar *original_name;
/* check if we have anything to operate on */
if (G_UNLIKELY (source_path_list == NULL))
@@ -295,12 +305,43 @@ thunar_application_collect_and_launch (ThunarApplication *application,
/* generate the target path list */
for (lp = g_list_last (source_path_list); lp != NULL; lp = lp->prev)
{
- path = thunar_vfs_path_relative (target_path, thunar_vfs_path_get_name (lp->data));
+ /* reset the path */
+ path = NULL;
+
+ /* check if we're copying from a location in the trash */
+ if (G_UNLIKELY (thunar_vfs_path_get_scheme (lp->data) == THUNAR_VFS_PATH_SCHEME_TRASH))
+ {
+ /* determine the info for the trashed resource */
+ info = thunar_vfs_info_new_for_path (lp->data, NULL);
+ if (G_LIKELY (info != NULL))
+ {
+ /* try to use the basename of the original path */
+ original_path = thunar_vfs_info_get_metadata (info, THUNAR_VFS_INFO_METADATA_TRASH_ORIGINAL_PATH, NULL);
+ if (G_LIKELY (original_path != NULL))
+ {
+ /* g_path_get_basename() may return '.' or '/' */
+ original_name = g_path_get_basename (original_path);
+ if (strcmp (original_name, ".") != 0 && strchr (original_name, G_DIR_SEPARATOR) == NULL)
+ path = thunar_vfs_path_relative (target_path, original_name);
+ g_free (original_name);
+ g_free (original_path);
+ }
+
+ /* release the info */
+ thunar_vfs_info_unref (info);
+ }
+ }
+
+ /* fallback to the path's basename */
+ if (G_LIKELY (path == NULL))
+ path = thunar_vfs_path_relative (target_path, thunar_vfs_path_get_name (lp->data));
+
+ /* add to the target path list */
target_path_list = g_list_prepend (target_path_list, path);
}
/* launch the operation */
- thunar_application_launch (application, widget, icon_name, title, launcher,
+ thunar_application_launch (application, parent, icon_name, title, launcher,
source_path_list, target_path_list, new_files_closure);
/* release the target path list */
@@ -311,7 +352,7 @@ thunar_application_collect_and_launch (ThunarApplication *application,
static void
thunar_application_launch (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
const gchar *icon_name,
const gchar *title,
Launcher launcher,
@@ -320,19 +361,22 @@ thunar_application_launch (ThunarApplication *application,
GClosure *new_files_closure)
{
ThunarVfsJob *job;
- GtkWidget *dialog;
GtkWindow *window;
+ GtkWidget *dialog;
+ GdkScreen *screen;
GError *error = NULL;
- /* determine the toplevel window for the widget */
- window = (widget != NULL) ? (GtkWindow *) gtk_widget_get_toplevel (widget) : NULL;
+ g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+
+ /* parse the parent pointer */
+ screen = thunar_util_parse_parent (parent, &window);
/* try to allocate a new job for the operation */
job = (*launcher) (source_path_list, target_path_list, &error);
if (G_UNLIKELY (job == NULL))
{
/* display an error message to the user */
- thunar_dialogs_show_error (widget, error, _("Failed to launch operation"));
+ thunar_dialogs_show_error (parent, error, _("Failed to launch operation"));
/* release the error */
g_error_free (error);
@@ -348,6 +392,7 @@ thunar_application_launch (ThunarApplication *application,
"icon-name", icon_name,
"title", title,
"job", job,
+ "screen", screen,
NULL);
/* connect to the parent (if any) */
@@ -632,7 +677,7 @@ thunar_application_open_window (ThunarApplication *application,
* @working_directory : the default working directory for the bulk rename dialog.
* @filenames : the list of file names that should be renamed or the empty
* list to start with an empty rename dialog. The file names
- * can either be absolute paths, file:-URIs or relative file
+ * can either be absolute paths, supported URIs or relative file
* names to @working_directory.
* @standalone : %TRUE to display the bulk rename dialog like a standalone
* application.
@@ -676,8 +721,8 @@ thunar_application_bulk_rename (ThunarApplication *application,
/* try to process all filenames and convert them to the appropriate file objects */
for (n = 0; filenames[n] != NULL; ++n)
{
- /* check if the filename is an absolute path or a file:-URI */
- if (g_path_is_absolute (filenames[n]) || g_str_has_prefix (filenames[n], "file:"))
+ /* check if the filename is an absolute path or looks like an URI */
+ if (g_path_is_absolute (filenames[n]) || thunar_util_looks_like_an_uri (filenames[n]))
{
/* determine the file for the filename directly */
file = thunar_file_get_for_uri (filenames[n], error);
@@ -721,7 +766,7 @@ thunar_application_bulk_rename (ThunarApplication *application,
* @application : a #ThunarApplication.
* @working_directory : the working directory relative to which the @filenames should
* be interpreted.
- * @filenames : a list of file:-URIs or filenames. If a filename is specified
+ * @filenames : a list of supported URIs or filenames. If a filename is specified
* it can be either an absolute path or a path relative to the
* @working_directory.
* @screen : the #GdkScreen on which to process the @filenames, or %NULL to
@@ -756,8 +801,8 @@ thunar_application_process_filenames (ThunarApplication *application,
/* try to process all filenames and convert them to the appropriate file objects */
for (n = 0; filenames[n] != NULL; ++n)
{
- /* check if the filename is an absolute path or a file:-URI */
- if (g_path_is_absolute (filenames[n]) || g_str_has_prefix (filenames[n], "file:"))
+ /* check if the filename is an absolute path or looks like an URI */
+ if (g_path_is_absolute (filenames[n]) || thunar_util_looks_like_an_uri (filenames[n]))
{
/* determine the file for the filename directly */
file = thunar_file_get_for_uri (filenames[n], &derror);
@@ -807,7 +852,7 @@ failure:
/**
* thunar_application_copy_to:
* @application : a #ThunarApplication.
- * @widget : the associated widget or %NULL.
+ * @parent : a #GdkScreen, a #GtkWidget or %NULL.
* @source_path_list : the list of #ThunarVfsPath<!---->s that should be copied.
* @target_path_list : the list of #ThunarVfsPath<!---->s where files should be copied to.
* @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
@@ -822,17 +867,17 @@ failure:
**/
void
thunar_application_copy_to (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *source_path_list,
GList *target_path_list,
GClosure *new_files_closure)
{
g_return_if_fail (g_list_length (source_path_list) == g_list_length (target_path_list));
- g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
+ g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
g_return_if_fail (THUNAR_IS_APPLICATION (application));
/* launch the operation */
- thunar_application_launch (application, widget, "stock_folder-copy",
+ thunar_application_launch (application, parent, "stock_folder-copy",
_("Copying files..."), thunar_vfs_copy_files,
source_path_list, target_path_list, new_files_closure);
}
@@ -842,7 +887,7 @@ thunar_application_copy_to (ThunarApplication *application,
/**
* thunar_application_copy_into:
* @application : a #ThunarApplication.
- * @widget : the associated widget or %NULL.
+ * @parent : a #GdkScreen, a #GtkWidget or %NULL.
* @source_path_list : the list of #ThunarVfsPath<!---->s that should be copied.
* @target_path : the #ThunarVfsPath to the target directory.
* @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
@@ -855,17 +900,17 @@ thunar_application_copy_to (ThunarApplication *application,
**/
void
thunar_application_copy_into (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *source_path_list,
ThunarVfsPath *target_path,
GClosure *new_files_closure)
{
+ g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
g_return_if_fail (target_path != NULL);
/* collect the target paths and launch the job */
- thunar_application_collect_and_launch (application, widget, "stock_folder-copy",
+ thunar_application_collect_and_launch (application, parent, "stock_folder-copy",
_("Copying files..."), thunar_vfs_copy_files,
source_path_list, target_path, new_files_closure);
}
@@ -875,7 +920,7 @@ thunar_application_copy_into (ThunarApplication *application,
/**
* thunar_application_link_into:
* @application : a #ThunarApplication.
- * @widget : the associated #GtkWidget or %NULL.
+ * @parent : a #GdkScreen, a #GtkWidget or %NULL.
* @source_path_list : the list of #ThunarVfsPath<!---->s that should be symlinked.
* @target_path : the target directory.
* @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
@@ -889,17 +934,17 @@ thunar_application_copy_into (ThunarApplication *application,
**/
void
thunar_application_link_into (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *source_path_list,
ThunarVfsPath *target_path,
GClosure *new_files_closure)
{
+ g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
g_return_if_fail (target_path != NULL);
/* collect the target paths and launch the job */
- thunar_application_collect_and_launch (application, widget, "stock_link",
+ thunar_application_collect_and_launch (application, parent, "stock_link",
_("Creating symbolic links..."),
thunar_vfs_link_files, source_path_list,
target_path, new_files_closure);
@@ -910,7 +955,7 @@ thunar_application_link_into (ThunarApplication *application,
/**
* thunar_application_move_into:
* @application : a #ThunarApplication.
- * @widget : the associated #GtkWidget or %NULL.
+ * @parent : a #GdkScreen, a #GtkWidget or %NULL.
* @source_path_list : the list of #ThunarVfsPath<!---->s that should be moved.
* @target_path : the target directory.
* @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
@@ -924,19 +969,34 @@ thunar_application_link_into (ThunarApplication *application,
**/
void
thunar_application_move_into (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *source_path_list,
ThunarVfsPath *target_path,
GClosure *new_files_closure)
{
+ const gchar *icon;
+ const gchar *text;
+
+ g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
g_return_if_fail (target_path != NULL);
+ /* determine the appropriate message text and the icon based on the target_path */
+ if (thunar_vfs_path_get_scheme (target_path) == THUNAR_VFS_PATH_SCHEME_TRASH)
+ {
+ icon = "gnome-fs-trash-full";
+ text = _("Moving files into the trash...");
+ }
+ else
+ {
+ icon = "stock_folder-move";
+ text = _("Moving files...");
+ }
+
/* launch the operation */
- thunar_application_collect_and_launch (application, widget, "stock_folder-move",
- _("Moving files..."), thunar_vfs_move_files,
- source_path_list, target_path, new_files_closure);
+ thunar_application_collect_and_launch (application, parent, icon, text,
+ thunar_vfs_move_files, source_path_list,
+ target_path, new_files_closure);
}
@@ -952,26 +1012,113 @@ unlink_stub (GList *source_path_list,
/**
- * thunar_application_unlink:
+ * thunar_application_unlink_files:
* @application : a #ThunarApplication.
- * @widget : the associated #GtkWidget or %NULL.
- * @path_list : the list of #ThunarVfsPath<!---->s that should be deleted.
+ * @parent : a #GdkScreen, a #GtkWidget or %NULL.
+ * @file_list : the list of #ThunarFile<!---->s that should be deleted.
*
- * Deletes all files referenced by the @path_list and takes care of all user
- * interaction.
+ * Deletes all files in the @file_list and takes care of all user interaction.
+ *
+ * If the user pressed the shift key while triggering the delete action,
+ * the files will be deleted permanently (after confirming the action),
+ * otherwise the files will be moved to the trash.
**/
void
-thunar_application_unlink (ThunarApplication *application,
- GtkWidget *widget,
- GList *path_list)
+thunar_application_unlink_files (ThunarApplication *application,
+ gpointer parent,
+ GList *file_list)
{
+ GdkModifierType state;
+ ThunarVfsPath *path;
+ GtkWidget *dialog;
+ GtkWindow *window;
+ GdkScreen *screen;
+ gboolean permanently;
+ GList *path_list = NULL;
+ GList *lp;
+ gchar *message;
+ guint n_path_list = 0;
+ gint response;
+
+ g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
- /* launch the operation */
- thunar_application_launch (application, widget, "stock_delete",
- _("Deleting files..."), unlink_stub,
- path_list, path_list, NULL);
+ /* check if we should permanently delete the files (user holds shift) */
+ permanently = (gtk_get_current_event_state (&state) && (state & GDK_SHIFT_MASK) != 0);
+
+ /* determine the paths for the files */
+ for (lp = g_list_last (file_list); lp != NULL; lp = lp->prev, ++n_path_list)
+ {
+ /* prepend the path to the path list */
+ path_list = thunar_vfs_path_list_prepend (path_list, thunar_file_get_path (lp->data));
+
+ /* check if the file is in the trash already */
+ if (thunar_file_is_trashed (lp->data))
+ permanently = TRUE;
+ }
+
+ /* nothing to do if we don't have any paths */
+ if (G_UNLIKELY (n_path_list == 0))
+ return;
+
+ /* ask the user to confirm if deleting permanently */
+ if (G_UNLIKELY (permanently))
+ {
+ /* parse the parent pointer */
+ screen = thunar_util_parse_parent (parent, &window);
+
+ /* generate the question to confirm the delete operation */
+ if (G_LIKELY (n_path_list == 1))
+ {
+ message = g_strdup_printf (_("Are you sure that you want to\npermanently delete \"%s\"?"),
+ thunar_file_get_display_name (THUNAR_FILE (file_list->data)));
+ }
+ else
+ {
+ message = g_strdup_printf (ngettext ("Are you sure that you want to permanently\ndelete the selected file?",
+ "Are you sure that you want to permanently\ndelete the %u selected files?",
+ n_path_list),
+ n_path_list);
+ }
+
+ /* ask the user to confirm the delete operation */
+ dialog = gtk_message_dialog_new (window,
+ GTK_DIALOG_MODAL
+ | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "%s", message);
+ if (G_UNLIKELY (window == NULL && screen != NULL))
+ gtk_window_set_screen (GTK_WINDOW (dialog), screen);
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_DELETE, GTK_RESPONSE_YES,
+ NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("If you delete a file, it is permanently lost."));
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ g_free (message);
+
+ /* perform the delete operation */
+ if (G_LIKELY (response == GTK_RESPONSE_YES))
+ {
+ /* launch the "Delete" operation */
+ thunar_application_launch (application, parent, "stock_delete",
+ _("Deleting files..."), unlink_stub,
+ path_list, path_list, NULL);
+ }
+ }
+ else
+ {
+ /* launch the "Move to Trash" operation */
+ path = thunar_vfs_path_get_for_trash ();
+ thunar_application_move_into (application, parent, path_list, path, NULL);
+ thunar_vfs_path_unref (path);
+ }
+
+ /* release the path list */
+ thunar_vfs_path_list_free (path_list);
}
@@ -989,7 +1136,7 @@ creat_stub (GList *source_path_list,
/**
* thunar_application_creat:
* @application : a #ThunarApplication.
- * @widget : the associated #GtkWidget or %NULL.
+ * @parent : a #GdkScreen, a #GtkWidget or %NULL.
* @path_list : the list of files to create.
* @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
* which will be emitted when the job finishes with the
@@ -1001,15 +1148,15 @@ creat_stub (GList *source_path_list,
**/
void
thunar_application_creat (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *path_list,
GClosure *new_files_closure)
{
+ g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
/* launch the operation */
- thunar_application_launch (application, widget, "stock_new",
+ thunar_application_launch (application, parent, "stock_new",
_("Creating files..."), creat_stub,
path_list, path_list, new_files_closure);
}
@@ -1029,7 +1176,7 @@ mkdir_stub (GList *source_path_list,
/**
* thunar_application_mkdir:
* @application : a #ThunarApplication.
- * @widget : the associated #GtkWidget or %NULL.
+ * @parent : a #GdkScreen, a #GtkWidget or %NULL.
* @path_list : the list of directories to create.
* @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
* which will be emitted when the job finishes with the
@@ -1041,17 +1188,222 @@ mkdir_stub (GList *source_path_list,
**/
void
thunar_application_mkdir (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *path_list,
GClosure *new_files_closure)
{
+ g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
/* launch the operation */
- thunar_application_launch (application, widget, "stock_folder",
+ thunar_application_launch (application, parent, "stock_folder",
_("Creating directories..."), mkdir_stub,
path_list, path_list, new_files_closure);
}
+
+/**
+ * thunar_application_empty_trash:
+ * @application : a #ThunarApplication.
+ * @parent : the parent, which can either be the associated
+ * #GtkWidget, the screen on which display the
+ * progress and the confirmation, or %NULL.
+ *
+ * Deletes all files and folders in the Trash after asking
+ * the user to confirm the operation.
+ **/
+void
+thunar_application_empty_trash (ThunarApplication *application,
+ gpointer parent)
+{
+ GtkWidget *dialog;
+ GtkWindow *window;
+ GdkScreen *screen;
+ GList path_list;
+ gint response;
+
+ g_return_if_fail (THUNAR_IS_APPLICATION (application));
+ g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+
+ /* parse the parent pointer */
+ screen = thunar_util_parse_parent (parent, &window);
+
+ /* ask the user to confirm the operation */
+ dialog = gtk_message_dialog_new (window,
+ GTK_DIALOG_MODAL
+ | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ _("Remove all files and folders from the Trash?"));
+ if (G_UNLIKELY (window == NULL && screen != NULL))
+ gtk_window_set_screen (GTK_WINDOW (dialog), screen);
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Empty Trash"), GTK_RESPONSE_YES,
+ NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ _("If you choose to empty the Trash, all items in it will be permanently lost. "
+ "Please note that you can also delete them separately."));
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+
+ /* check if the user confirmed */
+ if (G_LIKELY (response == GTK_RESPONSE_YES))
+ {
+ /* fake a path list with only the trash root (the root
+ * folder itself will never be unlinked, so this is safe)
+ */
+ path_list.data = thunar_vfs_path_get_for_trash ();
+ path_list.next = NULL;
+ path_list.prev = NULL;
+
+ /* launch the operation */
+ thunar_application_launch (application, parent, "gnome-fs-trash-empty",
+ _("Emptying the Trash..."),
+ unlink_stub, &path_list, NULL, NULL);
+
+ /* cleanup */
+ thunar_vfs_path_unref (path_list.data);
+ }
+}
+
+
+
+/**
+ * thunar_application_restore_files:
+ * @application : a #ThunarApplication.
+ * @parent : a #GdkScreen, a #GtkWidget or %NULL.
+ * @trash_file_list : a #GList of #ThunarFile<!---->s in the trash.
+ * @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
+ * which will be emitted when the job finishes with the
+ * list of #ThunarVfsPath<!---->s created by the job, or
+ * %NULL if you're not interested in the signal.
+ *
+ * Restores all #ThunarFile<!---->s in the @trash_file_list to their original
+ * location.
+ **/
+void
+thunar_application_restore_files (ThunarApplication *application,
+ gpointer parent,
+ GList *trash_file_list,
+ GClosure *new_files_closure)
+{
+ ThunarVfsPath *target_path;
+ GtkWidget *dialog;
+ GtkWindow *window;
+ GdkScreen *screen;
+ GError *err = NULL;
+ GList *source_path_list = NULL;
+ GList *target_path_list = NULL;
+ GList *lp;
+ gchar *original_path;
+ gchar *original_dir;
+ gchar *display_name;
+ gint response = GTK_RESPONSE_YES;
+
+ g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ g_return_if_fail (THUNAR_IS_APPLICATION (application));
+
+ /* determine the target paths for all files */
+ for (lp = trash_file_list; err == NULL && lp != NULL && response == GTK_RESPONSE_YES; lp = lp->next)
+ {
+ /* determine the original path for the file */
+ original_path = thunar_file_get_original_path (lp->data);
+ if (G_UNLIKELY (original_path == NULL))
+ {
+ /* no OriginalPath, impossible to continue */
+ g_set_error (&err, G_FILE_ERROR, G_FILE_ERROR_INVAL,
+ _("Failed to determine the original path for \"%s\""),
+ thunar_file_get_display_name (lp->data));
+ break;
+ }
+
+ /* determine the target path for the OriginalPath */
+ target_path = thunar_vfs_path_new (original_path, &err);
+ if (G_UNLIKELY (target_path == NULL))
+ {
+ /* invalid OriginalPath, cannot continue */
+ g_free (original_path);
+ break;
+ }
+
+ /* determine the directory of the original path */
+ original_dir = g_path_get_dirname (original_path);
+ if (!g_file_test (original_dir, G_FILE_TEST_IS_DIR))
+ {
+ /* parse the parent pointer */
+ screen = thunar_util_parse_parent (parent, &window);
+
+ /* ask the user whether to recreate the original dir */
+ display_name = g_filename_display_name (original_dir);
+ dialog = gtk_message_dialog_new (window,
+ GTK_DIALOG_MODAL
+ | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ _("Create the folder \"%s\"?"),
+ display_name);
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("C_reate Folder"), GTK_RESPONSE_YES,
+ NULL);
+ if (G_UNLIKELY (window == NULL && screen != NULL))
+ gtk_window_set_screen (GTK_WINDOW (dialog), screen);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ _("The folder \"%s\" does not exist anymore, but it is required to restore "
+ "the file \"%s\" from the trash. Do you want to create the folder again?"),
+ display_name, thunar_file_get_display_name (lp->data));
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ g_free (display_name);
+
+ /* check if the user wants to recreate the folder */
+ if (G_LIKELY (response == GTK_RESPONSE_YES))
+ {
+ /* try to recreate the folder */
+ xfce_mkdirhier (original_dir, 0755, &err);
+ }
+ }
+
+ /* check if we succeed and aren't cancelled */
+ if (G_LIKELY (err == NULL && response == GTK_RESPONSE_YES))
+ {
+ /* add the source/target pair to our lists */
+ source_path_list = thunar_vfs_path_list_append (source_path_list, thunar_file_get_path (lp->data));
+ target_path_list = g_list_append (target_path_list, target_path);
+ }
+ else
+ {
+ /* release the target path */
+ thunar_vfs_path_unref (target_path);
+ }
+
+ /* cleanup */
+ g_free (original_path);
+ g_free (original_dir);
+ }
+
+ /* check if an error occurred or the user cancelled */
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* display an error dialog */
+ thunar_dialogs_show_error (parent, err, _("Failed to restore \"%s\""), thunar_file_get_display_name (lp->data));
+ g_error_free (err);
+ }
+ else if (G_LIKELY (response == GTK_RESPONSE_YES))
+ {
+ /* launch the operation */
+ thunar_application_launch (application, parent, "stock_folder-move",
+ _("Restoring files..."), thunar_vfs_move_files,
+ source_path_list, target_path_list, new_files_closure);
+ }
+
+ /* cleanup */
+ thunar_vfs_path_list_free (target_path_list);
+ thunar_vfs_path_list_free (source_path_list);
+}
+
+
diff --git a/thunar/thunar-application.h b/thunar/thunar-application.h
index 48865c3d7ad2300569eb27317571245267e28090..9e052bf9ad0d9b455b531684799e3efb71c8a6bb 100644
--- a/thunar/thunar-application.h
+++ b/thunar/thunar-application.h
@@ -68,43 +68,51 @@ gboolean thunar_application_process_filenames (ThunarApplication *appl
GError **error);
void thunar_application_copy_to (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *source_path_list,
GList *target_path_list,
GClosure *new_files_closure);
void thunar_application_copy_into (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *source_path_list,
ThunarVfsPath *target_path,
GClosure *new_files_closure);
void thunar_application_link_into (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *source_path_list,
ThunarVfsPath *target_path,
GClosure *new_files_closure);
void thunar_application_move_into (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *source_path_list,
ThunarVfsPath *target_path,
GClosure *new_files_closure);
-void thunar_application_unlink (ThunarApplication *application,
- GtkWidget *widget,
- GList *path_list);
+void thunar_application_unlink_files (ThunarApplication *application,
+ gpointer parent,
+ GList *file_list);
void thunar_application_creat (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *path_list,
GClosure *new_files_closure);
void thunar_application_mkdir (ThunarApplication *application,
- GtkWidget *widget,
+ gpointer parent,
GList *path_list,
GClosure *new_files_closure);
+void thunar_application_empty_trash (ThunarApplication *application,
+ gpointer parent);
+
+void thunar_application_restore_files (ThunarApplication *application,
+ gpointer parent,
+ GList *trash_file_list,
+ GClosure *new_files_closure);
+
G_END_DECLS;
#endif /* !__THUNAR_APPLICATION_H__ */
diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
index a94ece2ce35cf3743f49c11a1b94260d185d8013..77ed9dd6b0ac29c8328edfbc6c23013a990c0edc 100644
--- a/thunar/thunar-chooser-button.c
+++ b/thunar/thunar-chooser-button.c
@@ -25,6 +25,7 @@
#include <thunar/thunar-chooser-dialog.h>
#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-gtk-extensions.h>
#include <thunar/thunar-icon-factory.h>
#include <thunar/thunar-pango-extensions.h>
@@ -75,8 +76,6 @@ struct _ThunarChooserButton
ThunarFile *file;
- GtkTooltips *tooltips;
-
ThunarVfsMimeDatabase *database;
};
@@ -153,10 +152,6 @@ thunar_chooser_button_init (ThunarChooserButton *chooser_button)
/* grab a reference on the mime database */
chooser_button->database = thunar_vfs_mime_database_get_default ();
- /* allocate tooltips */
- chooser_button->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (chooser_button->tooltips));
-
gtk_widget_push_composite_child ();
chooser_button->button = gtk_button_new ();
@@ -200,9 +195,6 @@ thunar_chooser_button_finalize (GObject *object)
/* disconnect from the mime database */
g_object_unref (G_OBJECT (chooser_button->database));
- /* release the tooltips */
- g_object_unref (G_OBJECT (chooser_button->tooltips));
-
(*G_OBJECT_CLASS (thunar_chooser_button_parent_class)->finalize) (object);
}
@@ -326,7 +318,6 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
GtkIconTheme *icon_theme;
const gchar *icon_name;
GdkPixbuf *icon = NULL;
- gchar *text;
gint icon_size;
g_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
@@ -369,13 +360,11 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
gtk_image_set_from_pixbuf (GTK_IMAGE (chooser_button->image), NULL);
}
- /* setup a useful tooltip and ATK description */
- text = g_strdup_printf (_("The selected application is used to open "
- "this and other files of type \"%s\"."),
- thunar_vfs_mime_info_get_comment (info));
- atk_object_set_name (gtk_widget_get_accessible (chooser_button->button), text);
- gtk_tooltips_set_tip (chooser_button->tooltips, chooser_button->button, text, NULL);
- g_free (text);
+ /* setup a useful tooltip for the button */
+ thunar_gtk_widget_set_tooltip (chooser_button->button,
+ _("The selected application is used to open "
+ "this and other files of type \"%s\"."),
+ thunar_vfs_mime_info_get_comment (info));
}
diff --git a/thunar/thunar-chooser-dialog.c b/thunar/thunar-chooser-dialog.c
index 2c2f12d244e824e6574f59a01f1dd1a16b24d967..181e457c15a1046dc52149d864ed16164a8e37ec 100644
--- a/thunar/thunar-chooser-dialog.c
+++ b/thunar/thunar-chooser-dialog.c
@@ -34,6 +34,7 @@
#include <thunar/thunar-chooser-model.h>
#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-gtk-extensions.h>
#include <thunar/thunar-icon-factory.h>
@@ -51,7 +52,6 @@ enum
static void thunar_chooser_dialog_class_init (ThunarChooserDialogClass *klass);
static void thunar_chooser_dialog_init (ThunarChooserDialog *dialog);
static void thunar_chooser_dialog_dispose (GObject *object);
-static void thunar_chooser_dialog_finalize (GObject *object);
static void thunar_chooser_dialog_get_property (GObject *object,
guint prop_id,
GValue *value,
@@ -108,7 +108,6 @@ struct _ThunarChooserDialog
ThunarFile *file;
gboolean open;
- GtkTooltips *tooltips;
GtkWidget *header_image;
GtkWidget *header_label;
GtkWidget *tree_view;
@@ -167,7 +166,6 @@ thunar_chooser_dialog_class_init (ThunarChooserDialogClass *klass)
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->dispose = thunar_chooser_dialog_dispose;
- gobject_class->finalize = thunar_chooser_dialog_finalize;
gobject_class->get_property = thunar_chooser_dialog_get_property;
gobject_class->set_property = thunar_chooser_dialog_set_property;
@@ -214,10 +212,6 @@ thunar_chooser_dialog_init (ThunarChooserDialog *dialog)
GtkWidget *box;
GtkWidget *swin;
- /* allocate tooltips */
- dialog->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (dialog->tooltips));
-
/* setup basic window properties */
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
@@ -289,8 +283,8 @@ thunar_chooser_dialog_init (ThunarChooserDialog *dialog)
/* create the "Custom command" expand */
dialog->custom_expander = gtk_expander_new_with_mnemonic (_("Use a _custom command:"));
- gtk_tooltips_set_tip (dialog->tooltips, dialog->custom_expander, _("Use a custom command for an application that is not "
- "available from the above application list."), NULL);
+ thunar_gtk_widget_set_tooltip (dialog->custom_expander, _("Use a custom command for an application that is not "
+ "available from the above application list."));
exo_binding_new_with_negation (G_OBJECT (dialog->custom_expander), "expanded", G_OBJECT (dialog->tree_view), "sensitive");
g_signal_connect (G_OBJECT (dialog->custom_expander), "notify::expanded", G_CALLBACK (thunar_chooser_dialog_notify_expanded), dialog);
gtk_box_pack_start (GTK_BOX (box), dialog->custom_expander, FALSE, FALSE, 0);
@@ -349,19 +343,6 @@ thunar_chooser_dialog_dispose (GObject *object)
-static void
-thunar_chooser_dialog_finalize (GObject *object)
-{
- ThunarChooserDialog *dialog = THUNAR_CHOOSER_DIALOG (object);
-
- /* release the tooltips */
- g_object_unref (G_OBJECT (dialog->tooltips));
-
- (*G_OBJECT_CLASS (thunar_chooser_dialog_parent_class)->finalize) (object);
-}
-
-
-
static void
thunar_chooser_dialog_get_property (GObject *object,
guint prop_id,
@@ -727,16 +708,16 @@ thunar_chooser_dialog_update_header (ThunarChooserDialog *dialog)
g_free (text);
/* update the "Browse..." tooltip */
- text = g_strdup_printf (_("Browse the file system to select an application to open files of type \"%s\"."),
- thunar_vfs_mime_info_get_comment (mime_info));
- gtk_tooltips_set_tip (dialog->tooltips, dialog->custom_button, text, NULL);
- g_free (text);
+ thunar_gtk_widget_set_tooltip (dialog->custom_button,
+ _("Browse the file system to select an "
+ "application to open files of type \"%s\"."),
+ thunar_vfs_mime_info_get_comment (mime_info));
/* update the "Use as default for this kind of file" tooltip */
- text = g_strdup_printf (_("Change the default application for files of type \"%s\" to the selected application."),
- thunar_vfs_mime_info_get_comment (mime_info));
- gtk_tooltips_set_tip (dialog->tooltips, dialog->default_button, text, NULL);
- g_free (text);
+ thunar_gtk_widget_set_tooltip (dialog->default_button,
+ _("Change the default application for files "
+ "of type \"%s\" to the selected application."),
+ thunar_vfs_mime_info_get_comment (mime_info));
/* cleanup */
g_object_unref (G_OBJECT (icon_factory));
diff --git a/thunar/thunar-clipboard-manager.c b/thunar/thunar-clipboard-manager.c
index 21abeda8a979b1036a3bfe5dd6d5dfe810aeb793..92537eb318125a2b1adc60cceb1e3c3aa10214fa 100644
--- a/thunar/thunar-clipboard-manager.c
+++ b/thunar/thunar-clipboard-manager.c
@@ -32,6 +32,7 @@
#include <thunar/thunar-clipboard-manager.h>
#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-private.h>
@@ -368,7 +369,7 @@ thunar_clipboard_manager_contents_received (GtkClipboard *clipboard,
g_closure_unref (request->new_files_closure);
g_object_unref (G_OBJECT (request->manager));
thunar_vfs_path_unref (request->target_path);
- g_free (request);
+ _thunar_slice_free (ThunarClipboardPasteRequest, request);
}
@@ -680,7 +681,7 @@ thunar_clipboard_manager_paste_files (ThunarClipboardManager *manager,
g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
/* prepare the paste request */
- request = g_new0 (ThunarClipboardPasteRequest, 1);
+ request = _thunar_slice_new0 (ThunarClipboardPasteRequest);
request->manager = g_object_ref (G_OBJECT (manager));
request->target_path = thunar_vfs_path_ref (target_path);
request->widget = widget;
diff --git a/thunar/thunar-dbus-service-infos.xml b/thunar/thunar-dbus-service-infos.xml
index b68f2ceec7fcb86e23e47e4d771445385b8b8104..87b59438e273b990231c5addd3bfb89d0ea18908 100644
--- a/thunar/thunar-dbus-service-infos.xml
+++ b/thunar/thunar-dbus-service-infos.xml
@@ -66,6 +66,7 @@
<arg direction="in" name="display" type="s" />
</method>
+
<!--
DisplayFileProperties (uri : STRING, display : STRING) : VOID
@@ -103,6 +104,84 @@
</method>
</interface>
+
+ <!--
+ org.xfce.Trash
+
+ The generic Xfce Trash Bin interface, implemented by all Xfce File
+ Managers that support a trash bin.
+ -->
+ <interface name="org.xfce.Trash">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="thunar_dbus_service" />
+
+ <!--
+ DisplayTrash (display : STRING) : VOID
+
+ display : the screen on which to display the trash folder
+ contents or "" to use the default screen of the
+ file manager.
+
+ Opens a new file manager window showing the trash folder
+ contents.
+ -->
+ <method name="DisplayTrash">
+ <arg direction="in" name="display" type="s" />
+ </method>
+
+ <!--
+ EmptyTrash (display : STRING) : VOID
+
+ display : the screen on which to display the confirmation of
+ the operation and the progress status or "" to use
+ the default screen of the file manager.
+
+ Tells the file manager to empty the trash bin.
+ -->
+ <method name="EmptyTrash">
+ <arg direction="in" name="display" type="s" />
+ </method>
+
+ <!--
+ MoveToTrash (uris : ARRAY OF STRING, display : STRING) : VOID
+
+ filenames : an array of file:-URIs or absolute paths for the files
+ that should be moved to the trash can.
+ display : the screen on which to display the progress dialog
+ and possible error messages and confirmation dialogs
+ or "" to use the default screen of the file manager.
+
+ Tells the file manager to move all files specified by the filenames
+ to the trash bin.
+ -->
+ <method name="MoveToTrash">
+ <arg direction="in" name="filenames" type="as" />
+ <arg direction="in" name="display" type="s" />
+ </method>
+
+ <!--
+ QueryTrash () : BOOLEAN
+
+ Determines whether the trash bin contains atleast one
+ item.
+
+ Returns: TRUE if the trash bin is not empty, FALSE otherwise.
+ -->
+ <method name="QueryTrash">
+ <arg direction="out" name="full" type="b" />
+ </method>
+
+ <!--
+ TrashChanged (full : BOOLEAN)
+
+ full : TRUE if the trash now contains atleast one item.
+
+ This signal is emitted by the file manager whenever the state
+ of the trash bin changes.
+ -->
+ <signal name="TrashChanged" />
+ </interface>
+
+
<!--
org.xfce.Thunar
diff --git a/thunar/thunar-dbus-service.c b/thunar/thunar-dbus-service.c
index dadaabec030cbf455f32047f4dca5ee7ab69b0b1..a6e8ae8cabd64c85796fe3e9476e2cdb8e3d9b36 100644
--- a/thunar/thunar-dbus-service.c
+++ b/thunar/thunar-dbus-service.c
@@ -46,12 +46,16 @@
static void thunar_dbus_service_class_init (ThunarDBusServiceClass *klass);
static void thunar_dbus_service_init (ThunarDBusService *dbus_service);
static void thunar_dbus_service_finalize (GObject *object);
+static gboolean thunar_dbus_service_connect_trash_bin (ThunarDBusService *dbus_service,
+ GError **error);
static gboolean thunar_dbus_service_parse_uri_and_display (ThunarDBusService *dbus_service,
const gchar *uri,
const gchar *display,
ThunarFile **file_return,
GdkScreen **screen_return,
GError **error);
+static void thunar_dbus_service_trash_bin_changed (ThunarDBusService *dbus_service,
+ ThunarFile *trash_bin);
static gboolean thunar_dbus_service_display_folder (ThunarDBusService *dbus_service,
const gchar *uri,
const gchar *display,
@@ -72,17 +76,30 @@ static gboolean thunar_dbus_service_launch (ThunarDBusServi
static gboolean thunar_dbus_service_display_preferences_dialog (ThunarDBusService *dbus_service,
const gchar *display,
GError **error);
-static gboolean thunar_dbus_service_launch_files (ThunarDBusService *dbus_service,
- const gchar *working_directory,
+static gboolean thunar_dbus_service_display_trash (ThunarDBusService *dbus_service,
+ const gchar *display,
+ GError **error);
+static gboolean thunar_dbus_service_empty_trash (ThunarDBusService *dbus_service,
+ const gchar *display,
+ GError **error);
+static gboolean thunar_dbus_service_move_to_trash (ThunarDBusService *dbus_service,
gchar **filenames,
const gchar *display,
GError **error);
+static gboolean thunar_dbus_service_query_trash (ThunarDBusService *dbus_service,
+ gboolean *empty,
+ GError **error);
static gboolean thunar_dbus_service_bulk_rename (ThunarDBusService *dbus_service,
const gchar *working_directory,
gchar **filenames,
gboolean standalone,
const gchar *display,
GError **error);
+static gboolean thunar_dbus_service_launch_files (ThunarDBusService *dbus_service,
+ const gchar *working_directory,
+ gchar **filenames,
+ const gchar *display,
+ GError **error);
static gboolean thunar_dbus_service_terminate (ThunarDBusService *dbus_service,
GError **error);
@@ -98,6 +115,7 @@ struct _ThunarDBusService
GObject __parent__;
DBusGConnection *connection;
+ ThunarFile *trash_bin;
};
@@ -149,6 +167,23 @@ thunar_dbus_service_class_init (ThunarDBusServiceClass *klass)
/* install the D-BUS info for our class */
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), &dbus_glib_thunar_dbus_service_object_info);
+
+ /**
+ * ThunarDBusService::trash-changed:
+ * @dbus_service : a #ThunarDBusService.
+ * @full : %TRUE if the trash bin now contains atleast
+ * one item, %FALSE otherwise.
+ *
+ * This signal is emitted whenever the state of the trash bin
+ * changes. Note that this signal is only emitted after the
+ * trash has previously been queried by a D-BUS client.
+ **/
+ g_signal_new (I_("trash-changed"),
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
}
@@ -190,11 +225,45 @@ thunar_dbus_service_finalize (GObject *object)
if (G_LIKELY (dbus_service->connection != NULL))
dbus_g_connection_unref (dbus_service->connection);
+ /* release the trash bin object */
+ if (G_LIKELY (dbus_service->trash_bin != NULL))
+ {
+ g_signal_handlers_disconnect_by_func (G_OBJECT (dbus_service->trash_bin), thunar_dbus_service_trash_bin_changed, dbus_service);
+ g_object_unref (G_OBJECT (dbus_service->trash_bin));
+ }
+
(*G_OBJECT_CLASS (thunar_dbus_service_parent_class)->finalize) (object);
}
+static gboolean
+thunar_dbus_service_connect_trash_bin (ThunarDBusService *dbus_service,
+ GError **error)
+{
+ ThunarVfsPath *trash_bin_path;
+
+ /* check if we're not already connected to the trash bin */
+ if (G_UNLIKELY (dbus_service->trash_bin == NULL))
+ {
+ /* try to connect to the trash bin */
+ trash_bin_path = thunar_vfs_path_get_for_trash ();
+ dbus_service->trash_bin = thunar_file_get_for_path (trash_bin_path, error);
+ if (G_LIKELY (dbus_service->trash_bin != NULL))
+ {
+ /* stay informed about changes to the trash bin */
+ g_signal_connect_swapped (G_OBJECT (dbus_service->trash_bin), "changed",
+ G_CALLBACK (thunar_dbus_service_trash_bin_changed),
+ dbus_service);
+ }
+ thunar_vfs_path_unref (trash_bin_path);
+ }
+
+ return (dbus_service->trash_bin != NULL);
+}
+
+
+
static gboolean
thunar_dbus_service_parse_uri_and_display (ThunarDBusService *dbus_service,
const gchar *uri,
@@ -221,6 +290,20 @@ thunar_dbus_service_parse_uri_and_display (ThunarDBusService *dbus_service,
+static void
+thunar_dbus_service_trash_bin_changed (ThunarDBusService *dbus_service,
+ ThunarFile *trash_bin)
+{
+ g_return_if_fail (THUNAR_IS_DBUS_SERVICE (dbus_service));
+ g_return_if_fail (dbus_service->trash_bin == trash_bin);
+ g_return_if_fail (THUNAR_IS_FILE (trash_bin));
+
+ /* emit the "trash-changed" signal with the new state */
+ g_signal_emit_by_name (G_OBJECT (dbus_service), "trash-changed", (thunar_file_get_size (trash_bin) > 0));
+}
+
+
+
static gboolean
thunar_dbus_service_display_folder (ThunarDBusService *dbus_service,
const gchar *uri,
@@ -400,6 +483,147 @@ thunar_dbus_service_display_preferences_dialog (ThunarDBusService *dbus_service,
+static gboolean
+thunar_dbus_service_display_trash (ThunarDBusService *dbus_service,
+ const gchar *display,
+ GError **error)
+{
+ ThunarApplication *application;
+ GdkScreen *screen;
+
+ /* connect to the trash bin on-demand */
+ if (!thunar_dbus_service_connect_trash_bin (dbus_service, error))
+ return FALSE;
+
+ /* try to open the screen for the display name */
+ screen = thunar_gdk_screen_open (display, error);
+ if (G_LIKELY (screen != NULL))
+ {
+ /* tell the application to display the trash bin */
+ application = thunar_application_get ();
+ thunar_application_open_window (application, dbus_service->trash_bin, screen);
+ g_object_unref (G_OBJECT (application));
+
+ /* release the screen */
+ g_object_unref (G_OBJECT (screen));
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+
+
+static gboolean
+thunar_dbus_service_empty_trash (ThunarDBusService *dbus_service,
+ const gchar *display,
+ GError **error)
+{
+ ThunarApplication *application;
+ GdkScreen *screen;
+
+ /* try to open the screen for the display name */
+ screen = thunar_gdk_screen_open (display, error);
+ if (G_LIKELY (screen != NULL))
+ {
+ /* tell the application to empty the trash bin */
+ application = thunar_application_get ();
+ thunar_application_empty_trash (application, screen);
+ g_object_unref (G_OBJECT (application));
+
+ /* release the screen */
+ g_object_unref (G_OBJECT (screen));
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+
+
+static gboolean
+thunar_dbus_service_move_to_trash (ThunarDBusService *dbus_service,
+ gchar **filenames,
+ const gchar *display,
+ GError **error)
+{
+ ThunarApplication *application;
+ ThunarVfsPath *target_path;
+ ThunarVfsPath *path;
+ GdkScreen *screen;
+ GError *err = NULL;
+ GList *path_list = NULL;
+ gchar *filename;
+ guint n;
+
+ /* try to open the screen for the display name */
+ screen = thunar_gdk_screen_open (display, &err);
+ if (G_LIKELY (screen != NULL))
+ {
+ /* try to parse the specified filenames */
+ for (n = 0; err == NULL && filenames[n] != NULL; ++n)
+ {
+ /* decode the filename (D-BUS uses UTF-8) */
+ filename = g_filename_from_utf8 (filenames[n], -1, NULL, NULL, &err);
+ if (G_LIKELY (err == NULL))
+ {
+ /* determine the path for the filename */
+ path = thunar_vfs_path_new (filename, &err);
+ if (G_LIKELY (path != NULL))
+ path_list = g_list_append (path_list, path);
+ }
+
+ /* cleanup */
+ g_free (filename);
+ }
+
+ /* check if we succeed */
+ if (G_LIKELY (err == NULL))
+ {
+ /* tell the application to move the specified files to the trash */
+ application = thunar_application_get ();
+ target_path = thunar_vfs_path_get_for_trash ();
+ thunar_application_move_into (application, screen, path_list, target_path, NULL);
+ g_object_unref (G_OBJECT (application));
+ thunar_vfs_path_unref (target_path);
+ }
+
+ /* cleanup */
+ thunar_vfs_path_list_free (path_list);
+ g_object_unref (G_OBJECT (screen));
+ }
+
+ /* check if we failed */
+ if (G_UNLIKELY (err != NULL))
+ {
+ /* propagate the error */
+ g_propagate_error (error, err);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+
+static gboolean
+thunar_dbus_service_query_trash (ThunarDBusService *dbus_service,
+ gboolean *full,
+ GError **error)
+{
+ /* connect to the trash bin on-demand */
+ if (thunar_dbus_service_connect_trash_bin (dbus_service, error))
+ {
+ /* check whether the trash bin is not empty */
+ *full = (thunar_file_get_size (dbus_service->trash_bin) > 0);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+
+
static gboolean
thunar_dbus_service_bulk_rename (ThunarDBusService *dbus_service,
const gchar *working_directory,
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index ece64ef673cffa3b9616fc6e37835b74f19b4dbe..33bce966a318c302c3e7e68ed4bc34e52d98a82f 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -21,13 +21,18 @@
#include <config.h>
#endif
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
#ifdef HAVE_STDARG_H
#include <stdarg.h>
#endif
-
-#include <exo/exo.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
#include <thunar/thunar-dialogs.h>
+#include <thunar/thunar-util.h>
@@ -128,42 +133,15 @@ thunar_dialogs_show_error (gpointer parent,
...)
{
GtkWidget *dialog;
- GtkWidget *window = NULL;
+ GtkWindow *window;
GdkScreen *screen;
va_list args;
gchar *primary_text;
g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
- /* determine the proper parent */
- if (parent == NULL)
- {
- /* just use the default screen then */
- screen = gdk_screen_get_default ();
- }
- else if (GDK_IS_SCREEN (parent))
- {
- /* yep, that's a screen */
- screen = GDK_SCREEN (parent);
- }
- else
- {
- /* parent is a widget, so let's determine the toplevel window */
- window = gtk_widget_get_toplevel (GTK_WIDGET (parent));
- if (GTK_WIDGET_TOPLEVEL (window))
- {
- /* make sure the toplevel window is shown */
- gtk_widget_show_now (window);
- }
- else
- {
- /* no toplevel, not usable then */
- window = NULL;
- }
-
- /* determine the screen for the widget */
- screen = gtk_widget_get_screen (GTK_WIDGET (parent));
- }
+ /* parse the parent pointer */
+ screen = thunar_util_parse_parent (parent, &window);
/* determine the primary error text */
va_start (args, format);
@@ -171,7 +149,7 @@ thunar_dialogs_show_error (gpointer parent,
va_end (args);
/* allocate the error dialog */
- dialog = gtk_message_dialog_new ((GtkWindow *) window,
+ dialog = gtk_message_dialog_new (window,
GTK_DIALOG_DESTROY_WITH_PARENT
| GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
@@ -179,7 +157,7 @@ thunar_dialogs_show_error (gpointer parent,
"%s.", primary_text);
/* move the dialog to the appropriate screen */
- if (window == NULL && screen != NULL)
+ if (G_UNLIKELY (window == NULL && screen != NULL))
gtk_window_set_screen (GTK_WINDOW (dialog), screen);
/* set secondary text if an error is provided */
@@ -220,12 +198,7 @@ thunar_dialogs_show_help (gpointer parent,
gchar *tmp;
/* determine the screen on which to launch the help */
- if (G_UNLIKELY (parent == NULL))
- screen = gdk_screen_get_default ();
- else if (GDK_IS_SCREEN (parent))
- screen = GDK_SCREEN (parent);
- else
- screen = gtk_widget_get_screen (GTK_WIDGET (parent));
+ screen = thunar_util_parse_parent (parent, NULL);
/* generate the command for the documentation browser */
command = g_strdup (LIBEXECDIR "/ThunarHelp");
@@ -261,3 +234,193 @@ thunar_dialogs_show_help (gpointer parent,
}
+
+/**
+ * thunar_dialogs_show_job_ask:
+ * @parent : the parent #GtkWindow or %NULL.
+ * @question : the question text.
+ * @choices : possible responses.
+ *
+ * Utility function to display a question dialog for the ThunarVfsJob::ask
+ * signal.
+ *
+ * Return value: the #ThunarVfsJobResponse.
+ **/
+ThunarVfsJobResponse
+thunar_dialogs_show_job_ask (GtkWindow *parent,
+ const gchar *question,
+ ThunarVfsJobResponse choices)
+{
+ const gchar *separator;
+ const gchar *mnemonic;
+ GtkWidget *message;
+ GtkWidget *button;
+ GString *secondary = g_string_sized_new (256);
+ GString *primary = g_string_sized_new (256);
+ gint response;
+ gint n;
+
+ g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ g_return_val_if_fail (g_utf8_validate (question, -1, NULL), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+
+ /* try to separate the question into primary and secondary parts */
+ separator = strstr (question, ": ");
+ if (G_LIKELY (separator != NULL))
+ {
+ /* primary is everything before the colon, plus a dot */
+ g_string_append_len (primary, question, separator - question);
+ g_string_append_c (primary, '.');
+
+ /* secondary is everything after the colon (skipping whitespace) */
+ do
+ ++separator;
+ while (g_ascii_isspace (*separator));
+ g_string_append (secondary, separator);
+ }
+ else
+ {
+ /* otherwise separate based on the \n\n */
+ separator = strstr (question, "\n\n");
+ if (G_LIKELY (separator != NULL))
+ {
+ /* primary is everything before the newlines */
+ g_string_append_len (primary, question, separator - question);
+
+ /* secondary is everything after the newlines (skipping whitespace) */
+ while (g_ascii_isspace (*separator))
+ ++separator;
+ g_string_append (secondary, separator);
+ }
+ else
+ {
+ /* everything is primary */
+ g_string_append (primary, question);
+ }
+ }
+
+ /* allocate the question message dialog */
+ message = gtk_message_dialog_new (parent,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ "%s", primary->str);
+ if (G_LIKELY (*secondary->str != '\0'))
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s", secondary->str);
+
+ /* add the buttons based on the possible choices */
+ for (n = 3; n >= 0; --n)
+ {
+ response = choices & (1 << n);
+ if (response == 0)
+ continue;
+
+ switch (response)
+ {
+ case THUNAR_VFS_JOB_RESPONSE_YES:
+ mnemonic = _("_Yes");
+ break;
+
+ case THUNAR_VFS_JOB_RESPONSE_YES_ALL:
+ mnemonic = _("Yes to _all");
+ break;
+
+ case THUNAR_VFS_JOB_RESPONSE_NO:
+ mnemonic = _("_No");
+ break;
+
+ case THUNAR_VFS_JOB_RESPONSE_CANCEL:
+ response = GTK_RESPONSE_CANCEL;
+ mnemonic = _("_Cancel");
+ break;
+
+ default:
+ g_assert_not_reached ();
+ break;
+ }
+
+ button = gtk_button_new_with_mnemonic (mnemonic);
+ GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+ gtk_dialog_add_action_widget (GTK_DIALOG (message), button, response);
+ gtk_widget_show (button);
+
+ gtk_dialog_set_default_response (GTK_DIALOG (message), response);
+ }
+
+ /* run the question dialog */
+ response = gtk_dialog_run (GTK_DIALOG (message));
+ gtk_widget_destroy (message);
+
+ /* transform the result as required */
+ if (G_UNLIKELY (response <= 0))
+ response = THUNAR_VFS_JOB_RESPONSE_CANCEL;
+
+ /* cleanup */
+ g_string_free (secondary, TRUE);
+ g_string_free (primary, TRUE);
+
+ return response;
+}
+
+
+
+/**
+ * thunar_dialogs_show_job_error:
+ * @parent : the parent #GtkWindow or %NULL.
+ * @error : the #GError provided by the #ThunarVfsJob.
+ *
+ * Utility function to display a message dialog for the
+ * ThunarVfsJob::error signal.
+ **/
+void
+thunar_dialogs_show_job_error (GtkWindow *parent,
+ GError *error)
+{
+ const gchar *separator;
+ GtkWidget *message;
+ GString *secondary = g_string_sized_new (256);
+ GString *primary = g_string_sized_new (256);
+
+ g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent));
+ g_return_if_fail (error != NULL && error->message != NULL);
+
+ /* try to separate the message into primary and secondary parts */
+ separator = strstr (error->message, ": ");
+ if (G_LIKELY (separator != NULL))
+ {
+ /* primary is everything before the colon, plus a dot */
+ g_string_append_len (primary, error->message, separator - error->message);
+ g_string_append_c (primary, '.');
+
+ /* secondary is everything after the colon (plus a dot) */
+ do
+ ++separator;
+ while (g_ascii_isspace (*separator));
+ g_string_append (secondary, separator);
+ if (!g_str_has_suffix (separator, "."))
+ g_string_append_c (secondary, '.');
+ }
+ else
+ {
+ /* primary is everything, secondary is empty */
+ g_string_append (primary, error->message);
+ }
+
+ /* allocate and display the error message dialog */
+ message = gtk_message_dialog_new (parent,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_NONE,
+ "%s", primary->str);
+ if (G_LIKELY (*secondary->str != '\0'))
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message), "%s", secondary->str);
+ gtk_dialog_add_button (GTK_DIALOG (message), GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL);
+ gtk_dialog_run (GTK_DIALOG (message));
+ gtk_widget_destroy (message);
+
+ /* cleanup */
+ g_string_free (secondary, TRUE);
+ g_string_free (primary, TRUE);
+}
+
diff --git a/thunar/thunar-dialogs.h b/thunar/thunar-dialogs.h
index a8189d86b9928a9c89a604861246efb808350a65..6ddc8948f218842969d1dadaf15e538add92c6f7 100644
--- a/thunar/thunar-dialogs.h
+++ b/thunar/thunar-dialogs.h
@@ -20,23 +20,29 @@
#ifndef __THUNAR_DIALOGS_H__
#define __THUNAR_DIALOGS_H__
-#include <gtk/gtk.h>
+#include <thunar-vfs/thunar-vfs.h>
G_BEGIN_DECLS;
-void thunar_dialogs_show_about (GtkWindow *parent,
- const gchar *title,
- const gchar *format,
- ...) G_GNUC_INTERNAL G_GNUC_PRINTF (3, 4);
-
-void thunar_dialogs_show_error (gpointer parent,
- const GError *error,
- const gchar *format,
- ...) G_GNUC_INTERNAL G_GNUC_PRINTF (3, 4);
-
-void thunar_dialogs_show_help (gpointer parent,
- const gchar *page,
- const gchar *offset) G_GNUC_INTERNAL;
+void thunar_dialogs_show_about (GtkWindow *parent,
+ const gchar *title,
+ const gchar *format,
+ ...) G_GNUC_INTERNAL G_GNUC_PRINTF (3, 4);
+
+void thunar_dialogs_show_error (gpointer parent,
+ const GError *error,
+ const gchar *format,
+ ...) G_GNUC_INTERNAL G_GNUC_PRINTF (3, 4);
+
+void thunar_dialogs_show_help (gpointer parent,
+ const gchar *page,
+ const gchar *offset) G_GNUC_INTERNAL;
+
+ThunarVfsJobResponse thunar_dialogs_show_job_ask (GtkWindow *parent,
+ const gchar *question,
+ ThunarVfsJobResponse choices) G_GNUC_INTERNAL;
+void thunar_dialogs_show_job_error (GtkWindow *parent,
+ GError *error) G_GNUC_INTERNAL;
G_END_DECLS;
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index bfe1de12f75328acf902c238226b8d714ad152a1..3302fba6175ecdeec02f954183d1df8a3c25bc1a 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -49,6 +49,7 @@
#include <thunar/thunar-file.h>
#include <thunar/thunar-file-monitor.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-util.h>
@@ -386,7 +387,18 @@ thunar_file_info_get_parent_uri (ThunarxFileInfo *file_info)
static gchar*
thunar_file_info_get_uri_scheme (ThunarxFileInfo *file_info)
{
- return g_strdup ("file");
+ switch (thunar_vfs_path_get_scheme (thunar_file_get_path (file_info)))
+ {
+ case THUNAR_VFS_PATH_SCHEME_FILE:
+ return g_strdup ("file");
+
+ case THUNAR_VFS_PATH_SCHEME_TRASH:
+ return g_strdup ("trash");
+
+ default:
+ g_assert_not_reached ();
+ return NULL;
+ }
}
@@ -1027,6 +1039,10 @@ thunar_file_accepts_drop (ThunarFile *file,
/* determine the path of the file */
path = thunar_file_get_path (file);
+ /* cannot create symbolic links in the trash or copy to the trash */
+ if (thunar_vfs_path_get_scheme (path) == THUNAR_VFS_PATH_SCHEME_TRASH)
+ actions &= ~(GDK_ACTION_COPY | GDK_ACTION_LINK);
+
/* check up to 100 of the paths (just in case somebody tries to
* drag around his music collection with 5000 files).
*/
@@ -1043,6 +1059,14 @@ thunar_file_accepts_drop (ThunarFile *file,
if (thunar_vfs_path_equal (path, parent_path))
return 0;
}
+
+ /* check if both source and target is in the trash */
+ if (G_UNLIKELY (thunar_vfs_path_get_scheme (lp->data) == THUNAR_VFS_PATH_SCHEME_TRASH
+ && thunar_vfs_path_get_scheme (path) == THUNAR_VFS_PATH_SCHEME_TRASH))
+ {
+ /* copy/move/link within the trash not possible */
+ return 0;
+ }
}
/* if the source offers both copy and move and the GTK+ suggested action is copy, try to be smart telling whether
@@ -1056,6 +1080,10 @@ thunar_file_accepts_drop (ThunarFile *file,
/* check for up to 100 files, for the reason state above */
for (lp = path_list, n = 0; lp != NULL && n < 100; lp = lp->next, ++n)
{
+ /* dropping from the trash always suggests move */
+ if (G_UNLIKELY (thunar_vfs_path_get_scheme (lp->data) == THUNAR_VFS_PATH_SCHEME_TRASH))
+ break;
+
/* determine the cached version of the source file */
ofile = thunar_file_cache_lookup (lp->data);
@@ -1103,29 +1131,6 @@ thunar_file_accepts_drop (ThunarFile *file,
-/**
- * thunar_file_get_display_name:
- * @file : a #ThunarFile instance.
- *
- * Returns the @file name in the UTF-8 encoding, which is
- * suitable for displaying the file name in the GUI.
- *
- * Return value: the @file name suitable for display.
- **/
-const gchar*
-thunar_file_get_display_name (const ThunarFile *file)
-{
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
-
- /* root directory is always displayed as 'Filesystem' */
- if (thunar_file_is_root (file))
- return _("File System");
-
- return file->info->display_name;
-}
-
-
-
/**
* thunar_file_get_date:
* @file : a #ThunarFile instance.
@@ -1170,30 +1175,7 @@ gchar*
thunar_file_get_date_string (const ThunarFile *file,
ThunarFileDateType date_type)
{
- ThunarVfsFileTime time;
-#ifdef HAVE_LOCALTIME_R
- struct tm tmbuf;
-#endif
- struct tm *tm;
- gchar *result;
-
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
-
- /* query the date on the given file */
- time = thunar_file_get_date (file, date_type);
-
- /* convert to local time */
-#ifdef HAVE_LOCALTIME_R
- tm = localtime_r (&time, &tmbuf);
-#else
- tm = localtime (&time);
-#endif
-
- /* convert to string */
- result = g_new (gchar, 20);
- strftime (result, 20, "%Y-%m-%d %H:%M:%S", tm);
-
- return result;
+ return thunar_util_humanize_file_time (thunar_file_get_date (file, date_type));
}
@@ -1355,6 +1337,77 @@ thunar_file_get_user (const ThunarFile *file)
+/**
+ * thunar_file_get_deletion_date:
+ * @file : a #ThunarFile instance.
+ *
+ * Returns the deletion date of the @file if the @file
+ * is located in the trash. Otherwise %NULL will be
+ * returned.
+ *
+ * The caller is responsible to free the returned string
+ * using g_free() when no longer needed.
+ *
+ * Return value: the deletion date of @file if @file is
+ * in the trash, %NULL otherwise.
+ **/
+gchar*
+thunar_file_get_deletion_date (const ThunarFile *file)
+{
+#ifdef HAVE_STRPTIME
+ struct tm tm;
+#endif
+ time_t time;
+ gchar *date;
+
+ g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+
+ /* query the DeletionDate from the trash backend */
+ date = thunar_vfs_info_get_metadata (file->info, THUNAR_VFS_INFO_METADATA_TRASH_DELETION_DATE, NULL);
+ if (G_UNLIKELY (date == NULL))
+ return NULL;
+
+ /* try to parse the DeletionDate (ISO date string) */
+#ifdef HAVE_STRPTIME
+ time = (strptime (date, "%FT%T", &tm) != NULL) ? mktime (&tm) : 0;
+#else
+ time = 0;
+#endif
+
+ /* release the DeletionDate */
+ g_free (date);
+
+ /* humanize the time value */
+ return thunar_util_humanize_file_time (time);
+}
+
+
+
+/**
+ * thunar_file_get_original_path:
+ * @file : a #ThunarFile instance.
+ *
+ * Returns the original path of the @file if the @file
+ * is located in the trash. Otherwise %NULL will be
+ * returned.
+ *
+ * The caller is responsible to free the returned string
+ * using g_free() when no longer needed.
+ *
+ * Return value: the original path of @file if @file is
+ * in the trash, %NULL otherwise.
+ **/
+gchar*
+thunar_file_get_original_path (const ThunarFile *file)
+{
+ g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+
+ /* query the OriginalPath from the trash backend */
+ return thunar_vfs_info_get_metadata (file->info, THUNAR_VFS_INFO_METADATA_TRASH_ORIGINAL_PATH, NULL);
+}
+
+
+
/**
* thunar_file_is_chmodable:
* @file : a #ThunarFile instance.
@@ -1372,9 +1425,10 @@ thunar_file_is_chmodable (const ThunarFile *file)
/* we can only change the mode if we the euid is
* a) equal to the file owner id
* or
- * b) the super-user id.
+ * b) the super-user id
+ * and the file is not in the trash.
*/
- return (effective_user_id == 0 || effective_user_id == file->info->uid);
+ return ((effective_user_id == 0 || effective_user_id == file->info->uid) && !thunar_file_is_trashed (file));
}
@@ -1397,8 +1451,8 @@ thunar_file_is_renameable (const ThunarFile *file)
g_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
- /* we cannot rename root nodes */
- if (G_LIKELY (!thunar_file_is_root (file)))
+ /* we cannot the node node or trashed files */
+ if (!thunar_file_is_root (file) && !thunar_file_is_trashed (file))
{
/* we just do a guess here, by checking whether the folder is writable */
file = thunar_file_get_parent (file, NULL);
@@ -1414,33 +1468,6 @@ thunar_file_is_renameable (const ThunarFile *file)
-/**
- * thunar_file_get_actions:
- * @file : a #ThunarFile instance.
- * @window : a #GdkWindow instance.
- *
- * Returns additional #GtkAction<!---->s for @file.
- *
- * The caller is responsible to free the returned list
- * using
- * <informalexample><programlisting>
- * g_list_foreach (list, (GFunc) g_object_unref, NULL);
- * g_list_free (list);
- * </programlisting></informalexample>
- *
- * Return value: additional #GtkAction<!---->s for @file.
- **/
-GList*
-thunar_file_get_actions (ThunarFile *file,
- GtkWidget *window)
-{
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
- g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
- return NULL;
-}
-
-
-
/**
* thunar_file_get_emblem_names:
* @file : a #ThunarFile instance.
@@ -1596,13 +1623,6 @@ thunar_file_get_icon_name (const ThunarFile *file,
g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
- /* special icon for the root node */
- if (G_UNLIKELY (thunar_file_is_root (file))
- && gtk_icon_theme_has_icon (icon_theme, "gnome-dev-harddisk"))
- {
- return "gnome-dev-harddisk";
- }
-
/* special icon for the home node */
if (G_UNLIKELY (thunar_file_is_home (file))
&& gtk_icon_theme_has_icon (icon_theme, "gnome-fs-home"))
diff --git a/thunar/thunar-file.h b/thunar/thunar-file.h
index 0fe7736a476be1314278193017b3cc73f2318681..91c45c5ed0a6ca1fc52f6483c37b3b56530ad3af 100644
--- a/thunar/thunar-file.h
+++ b/thunar/thunar-file.h
@@ -144,9 +144,9 @@ ThunarVfsFileTime thunar_file_get_date (const ThunarFile *file
ThunarFileDateType date_type);
gchar *thunar_file_get_date_string (const ThunarFile *file,
- ThunarFileDateType date_type);
-gchar *thunar_file_get_mode_string (const ThunarFile *file);
-gchar *thunar_file_get_size_string (const ThunarFile *file);
+ ThunarFileDateType date_type) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar *thunar_file_get_mode_string (const ThunarFile *file) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar *thunar_file_get_size_string (const ThunarFile *file) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
ThunarVfsVolume *thunar_file_get_volume (const ThunarFile *file,
ThunarVfsVolumeManager *volume_manager);
@@ -154,12 +154,12 @@ ThunarVfsVolume *thunar_file_get_volume (const ThunarFile *file
ThunarVfsGroup *thunar_file_get_group (const ThunarFile *file);
ThunarVfsUser *thunar_file_get_user (const ThunarFile *file);
+gchar *thunar_file_get_deletion_date (const ThunarFile *file) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar *thunar_file_get_original_path (const ThunarFile *file) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
gboolean thunar_file_is_chmodable (const ThunarFile *file);
gboolean thunar_file_is_renameable (const ThunarFile *file);
-GList *thunar_file_get_actions (ThunarFile *file,
- GtkWidget *window);
-
GList *thunar_file_get_emblem_names (ThunarFile *file);
void thunar_file_set_emblem_names (ThunarFile *file,
GList *emblem_names);
@@ -342,6 +342,29 @@ G_STMT_START{ \
+/**
+ * thunar_file_is_local:
+ * @file : a #ThunarFile instance.
+ *
+ * Returns %TRUE if @file is a local file with the
+ * %THUNAR_VFS_PATH_SCHEME_FILE scheme.
+ *
+ * Return value: %TRUE if @file is local.
+ **/
+#define thunar_file_is_local(file) (thunar_vfs_path_get_scheme (thunar_file_get_path ((file))) == THUNAR_VFS_PATH_SCHEME_FILE)
+
+/**
+ * thunar_file_is_trashed:
+ * @file : a #ThunarFile instance.
+ *
+ * Returns %TRUE if @file is a local file with the
+ * %THUNAR_VFS_PATH_SCHEME_TRASH scheme.
+ *
+ * Return value: %TRUE if @file is in the trash, or
+ * the trash folder itself.
+ **/
+#define thunar_file_is_trashed(file) (thunar_vfs_path_get_scheme (thunar_file_get_path ((file))) == THUNAR_VFS_PATH_SCHEME_TRASH)
+
/**
* thunar_file_is_ancestor:
* @file : a #ThunarFile instance.
@@ -449,6 +472,17 @@ G_STMT_START{ \
**/
#define thunar_file_is_symlink(file) ((THUNAR_FILE ((file))->info->flags & THUNAR_VFS_FILE_FLAGS_SYMLINK) != 0)
+/**
+ * thunar_file_get_display_name:
+ * @file : a #ThunarFile instance.
+ *
+ * Returns the @file name in the UTF-8 encoding, which is
+ * suitable for displaying the file name in the GUI.
+ *
+ * Return value: the @file name suitable for display.
+ **/
+#define thunar_file_get_display_name(file) (THUNAR_FILE ((file))->info->display_name)
+
/**
* thunar_file_read_link:
* @file : a #ThunarFile instance.
diff --git a/thunar/thunar-gtk-extensions.c b/thunar/thunar-gtk-extensions.c
index c0494ae2a1d533822841df477404f7baf63a49ae..001997bfbb437ab7e6fb5687f18259849547bfc5 100644
--- a/thunar/thunar-gtk-extensions.c
+++ b/thunar/thunar-gtk-extensions.c
@@ -21,6 +21,10 @@
#include <config.h>
#endif
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
#include <thunar/thunar-gtk-extensions.h>
@@ -173,3 +177,44 @@ thunar_gtk_ui_manager_get_action_by_name (GtkUIManager *ui_manager,
}
+
+/**
+ * thunar_gtk_widget_set_tooltip:
+ * @widget : a #GtkWidget for which to set the tooltip.
+ * @format : a printf(3)-style format string.
+ * @... : additional arguments for @format.
+ *
+ * Sets the tooltip for the @widget to a string generated
+ * from the @format and the additional arguments in @...<!--->,
+ * utilizing the shared #GtkTooltips instance.
+ **/
+void
+thunar_gtk_widget_set_tooltip (GtkWidget *widget,
+ const gchar *format,
+ ...)
+{
+ static GtkTooltips *tooltips = NULL;
+ va_list var_args;
+ gchar *tooltip;
+
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+ g_return_if_fail (g_utf8_validate (format, -1, NULL));
+
+ /* allocate the shared tooltips on-demand */
+ if (G_UNLIKELY (tooltips == NULL))
+ tooltips = gtk_tooltips_new ();
+
+ /* determine the tooltip */
+ va_start (var_args, format);
+ tooltip = g_strdup_vprintf (format, var_args);
+ va_end (var_args);
+
+ /* setup the tooltip for the widget */
+ gtk_tooltips_set_tip (tooltips, widget, tooltip, NULL);
+
+ /* release the tooltip */
+ g_free (tooltip);
+}
+
+
+
diff --git a/thunar/thunar-gtk-extensions.h b/thunar/thunar-gtk-extensions.h
index f326fa49cb1651a0c001cbdfa127599de8e05e96..54ac7b4c077a38d45bb916242317b4cb103637c8 100644
--- a/thunar/thunar-gtk-extensions.h
+++ b/thunar/thunar-gtk-extensions.h
@@ -37,6 +37,10 @@ void thunar_gtk_icon_factory_insert_icon (GtkIconFactory *icon_
GtkAction *thunar_gtk_ui_manager_get_action_by_name (GtkUIManager *ui_manager,
const gchar *action_name) G_GNUC_INTERNAL;
+void thunar_gtk_widget_set_tooltip (GtkWidget *widget,
+ const gchar *format,
+ ...) G_GNUC_INTERNAL G_GNUC_PRINTF (2, 3);
+
G_END_DECLS;
#endif /* !__THUNAR_GTK_EXTENSIONS_H__ */
diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c
index e720a08a7e1d83e13596d0dc232e67f6019ca8fe..5637b2c723f1a3e48930d7798c43eea8d7b56b62 100644
--- a/thunar/thunar-list-model.c
+++ b/thunar/thunar-list-model.c
@@ -2164,9 +2164,14 @@ thunar_list_model_get_statusbar_text (ThunarListModel *store,
GtkTreeIter iter;
ThunarFile *file;
GList *lp;
+ gchar *absolute_path;
gchar *fspace_string;
+ gchar *display_name;
gchar *size_string;
gchar *text;
+ gchar *s;
+ gint height;
+ gint width;
gint n;
Row *row;
@@ -2240,6 +2245,31 @@ thunar_list_model_get_statusbar_text (ThunarListModel *store,
size_string, thunar_vfs_mime_info_get_comment (mime_info));
}
g_free (size_string);
+
+ /* append the original path (if any) */
+ absolute_path = thunar_file_get_original_path (file);
+ if (G_UNLIKELY (absolute_path != NULL))
+ {
+ /* append the original path to the statusbar text */
+ display_name = g_filename_display_name (absolute_path);
+ s = g_strdup_printf ("%s, %s %s", text, _("Original Path:"), display_name);
+ g_free (display_name);
+ g_free (text);
+ text = s;
+ }
+ else if (thunar_file_is_local (file))
+ {
+ /* check if we can determine the dimension of this file (only for image files) */
+ absolute_path = thunar_vfs_path_dup_string (thunar_file_get_path (file));
+ if (gdk_pixbuf_get_file_info (absolute_path, &width, &height) != NULL)
+ {
+ /* append the image dimensions to the statusbar text */
+ s = g_strdup_printf ("%s, %s %dx%d", text, _("Image Size:"), width, height);
+ g_free (text);
+ text = s;
+ }
+ }
+ g_free (absolute_path);
}
else
{
diff --git a/thunar/thunar-location-buttons.c b/thunar/thunar-location-buttons.c
index 22fbd6088d8de0d6fdfdd6bffe334396473e41c8..75db7dd4c1d5724a0c2abde1f704a58e50ec0f53 100644
--- a/thunar/thunar-location-buttons.c
+++ b/thunar/thunar-location-buttons.c
@@ -111,6 +111,8 @@ static void thunar_location_buttons_context_menu (ThunarL
ThunarLocationButtons *buttons);
static void thunar_location_buttons_action_create_folder (GtkAction *action,
ThunarLocationButtons *buttons);
+static void thunar_location_buttons_action_empty_trash (GtkAction *action,
+ ThunarLocationButtons *buttons);
static void thunar_location_buttons_action_down_folder (GtkAction *action,
ThunarLocationButtons *buttons);
static void thunar_location_buttons_action_open (GtkAction *action,
@@ -1240,18 +1242,35 @@ thunar_location_buttons_context_menu (ThunarLocationButton *button,
/* add a separator */
gtk_ui_manager_add_ui (ui_manager, merge_id, "/ThunarLocationButtons::context-menu", "separator1", NULL, GTK_UI_MANAGER_SEPARATOR, FALSE);
- /* add the "Create Folder" action */
- tooltip = g_strdup_printf (_("Create a new folder in \"%s\""), thunar_file_get_display_name (file));
- action = gtk_action_new ("ThunarLocationButtons::create-folder", _("Create _Folder..."), tooltip, NULL);
- g_object_set_data_full (G_OBJECT (action), I_("thunar-file"), g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
- g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (thunar_location_buttons_action_create_folder), buttons);
- gtk_action_set_sensitive (action, thunar_file_is_writable (file));
- gtk_action_group_add_action (action_group, action);
- gtk_ui_manager_add_ui (ui_manager, merge_id, "/ThunarLocationButtons::context-menu",
- gtk_action_get_name (action), gtk_action_get_name (action),
- GTK_UI_MANAGER_MENUITEM, FALSE);
- g_object_unref (G_OBJECT (action));
- g_free (tooltip);
+ /* check if we don't have a trashed resource here */
+ if (G_LIKELY (!thunar_file_is_trashed (file)))
+ {
+ /* add the "Create Folder" action */
+ tooltip = g_strdup_printf (_("Create a new folder in \"%s\""), thunar_file_get_display_name (file));
+ action = gtk_action_new ("ThunarLocationButtons::create-folder", _("Create _Folder..."), tooltip, NULL);
+ g_object_set_data_full (G_OBJECT (action), I_("thunar-file"), g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
+ g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (thunar_location_buttons_action_create_folder), buttons);
+ gtk_action_set_sensitive (action, thunar_file_is_writable (file));
+ gtk_action_group_add_action (action_group, action);
+ gtk_ui_manager_add_ui (ui_manager, merge_id, "/ThunarLocationButtons::context-menu",
+ gtk_action_get_name (action), gtk_action_get_name (action),
+ GTK_UI_MANAGER_MENUITEM, FALSE);
+ g_object_unref (G_OBJECT (action));
+ g_free (tooltip);
+ }
+ else if (thunar_file_is_root (file))
+ {
+ /* add the "Empty Trash" action */
+ action = gtk_action_new ("ThunarLocationButtons::empty-trash", _("_Empty Trash"), _("Delete all files and folders in the Trash"), NULL);
+ g_object_set_data_full (G_OBJECT (action), I_("thunar-file"), g_object_ref (G_OBJECT (file)), (GDestroyNotify) g_object_unref);
+ g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (thunar_location_buttons_action_empty_trash), buttons);
+ gtk_action_set_sensitive (action, (thunar_file_get_size (file) > 0));
+ gtk_action_group_add_action (action_group, action);
+ gtk_ui_manager_add_ui (ui_manager, merge_id, "/ThunarLocationButtons::context-menu",
+ gtk_action_get_name (action), gtk_action_get_name (action),
+ GTK_UI_MANAGER_MENUITEM, FALSE);
+ g_object_unref (G_OBJECT (action));
+ }
/* add a separator */
gtk_ui_manager_add_ui (ui_manager, merge_id, "/ThunarLocationButtons::context-menu", "separator2", NULL, GTK_UI_MANAGER_SEPARATOR, FALSE);
@@ -1369,6 +1388,23 @@ thunar_location_buttons_action_create_folder (GtkAction *action,
+static void
+thunar_location_buttons_action_empty_trash (GtkAction *action,
+ ThunarLocationButtons *buttons)
+{
+ ThunarApplication *application;
+
+ g_return_if_fail (GTK_IS_ACTION (action));
+ g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+
+ /* launch the operation */
+ application = thunar_application_get ();
+ thunar_application_empty_trash (application, GTK_WIDGET (buttons));
+ g_object_unref (G_OBJECT (application));
+}
+
+
+
static void
thunar_location_buttons_action_down_folder (GtkAction *action,
ThunarLocationButtons *buttons)
diff --git a/thunar/thunar-metafile.c b/thunar/thunar-metafile.c
index 8783ad8ea39d657478adaaf8327850b124da8e99..9085df34bb61bf8d2ac122556b266158517acbac 100644
--- a/thunar/thunar-metafile.c
+++ b/thunar/thunar-metafile.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
*
* 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
@@ -263,8 +263,10 @@ thunar_metafile_fetch (ThunarMetafile *metafile,
if (G_UNLIKELY (metafile->context == NULL))
goto use_default_value;
- /* determine the string representation of the path */
- key_size = thunar_vfs_path_to_string (path, key_path, sizeof (key_path), NULL);
+ /* determine the string representation of the path (using the URI for non-local paths) */
+ key_size = (thunar_vfs_path_get_scheme (path) == THUNAR_VFS_PATH_SCHEME_FILE)
+ ? thunar_vfs_path_to_string (path, key_path, sizeof (key_path), NULL)
+ : thunar_vfs_path_to_uri (path, key_path, sizeof (key_path), NULL);
if (G_UNLIKELY (key_size <= 0))
goto use_default_value;
@@ -352,8 +354,10 @@ thunar_metafile_store (ThunarMetafile *metafile,
if (G_UNLIKELY (metafile->context == NULL))
return;
- /* determine the string representation of the path */
- key_size = thunar_vfs_path_to_string (path, key_path, sizeof (key_path), NULL);
+ /* determine the string representation of the path (using the URI for non-local paths) */
+ key_size = (thunar_vfs_path_get_scheme (path) == THUNAR_VFS_PATH_SCHEME_FILE)
+ ? thunar_vfs_path_to_string (path, key_path, sizeof (key_path), NULL)
+ : thunar_vfs_path_to_uri (path, key_path, sizeof (key_path), NULL);
if (G_UNLIKELY (key_size <= 0))
return;
diff --git a/thunar/thunar-path-entry.c b/thunar/thunar-path-entry.c
index affd3092ebee1923b7de6b8b87bf1facb83170cc..439975282421c751f33d611ab2a1f2afb7b8e0f0 100644
--- a/thunar/thunar-path-entry.c
+++ b/thunar/thunar-path-entry.c
@@ -24,6 +24,9 @@
#include <config.h>
#endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
#ifdef HAVE_MEMORY_H
#include <memory.h>
#endif
@@ -38,6 +41,7 @@
#include <thunar/thunar-icon-renderer.h>
#include <thunar/thunar-list-model.h>
#include <thunar/thunar-path-entry.h>
+#include <thunar/thunar-util.h>
@@ -333,7 +337,10 @@ thunar_path_entry_finalize (GObject *object)
/* release the current-file reference */
if (G_LIKELY (path_entry->current_file != NULL))
- g_object_unref (G_OBJECT (path_entry->current_file));
+ {
+ g_signal_handlers_disconnect_by_func (G_OBJECT (path_entry->current_file), thunar_path_entry_set_current_file, path_entry);
+ g_object_unref (G_OBJECT (path_entry->current_file));
+ }
/* drop the check_completion_idle source */
if (G_UNLIKELY (path_entry->check_completion_idle_id >= 0))
@@ -786,6 +793,7 @@ thunar_path_entry_changed (GtkEditable *editable)
ThunarVfsPath *folder_path = NULL;
ThunarVfsPath *file_path = NULL;
ThunarFolder *folder;
+ const gchar *text;
ThunarFile *current_folder;
ThunarFile *current_file;
gchar *folder_part = NULL;
@@ -795,8 +803,25 @@ thunar_path_entry_changed (GtkEditable *editable)
if (G_UNLIKELY (path_entry->in_change))
return;
- /* parse the entered string */
- if (thunar_path_entry_parse (path_entry, &folder_part, &file_part, NULL))
+ /* parse the entered string (handling URIs properly) */
+ text = gtk_entry_get_text (GTK_ENTRY (path_entry));
+ if (G_UNLIKELY (thunar_util_looks_like_an_uri (text)))
+ {
+ /* try to parse the URI text */
+ file_path = thunar_vfs_path_new (text, NULL);
+ if (G_LIKELY (file_path != NULL))
+ {
+ /* check if the file_path ends with a separator */
+ if (g_str_has_suffix (text, "/"))
+ folder_path = file_path;
+ else if (!thunar_vfs_path_is_root (file_path))
+ folder_path = thunar_vfs_path_get_parent (file_path);
+
+ /* need to take a reference for the folder_path */
+ thunar_vfs_path_ref (folder_path);
+ }
+ }
+ else if (thunar_path_entry_parse (path_entry, &folder_part, &file_part, NULL))
{
/* determine the folder path */
folder_path = thunar_vfs_path_new (folder_part, NULL);
@@ -842,10 +867,16 @@ thunar_path_entry_changed (GtkEditable *editable)
if (current_file != path_entry->current_file)
{
if (G_UNLIKELY (path_entry->current_file != NULL))
- g_object_unref (G_OBJECT (path_entry->current_file));
+ {
+ g_signal_handlers_disconnect_by_func (G_OBJECT (path_entry->current_file), thunar_path_entry_set_current_file, path_entry);
+ g_object_unref (G_OBJECT (path_entry->current_file));
+ }
path_entry->current_file = current_file;
if (G_UNLIKELY (current_file != NULL))
- g_object_ref (G_OBJECT (current_file));
+ {
+ g_object_ref (G_OBJECT (current_file));
+ g_signal_connect_swapped (G_OBJECT (current_file), "changed", G_CALLBACK (thunar_path_entry_set_current_file), path_entry);
+ }
g_object_notify (G_OBJECT (path_entry), "current-file");
}
@@ -1259,7 +1290,7 @@ thunar_path_entry_parse (ThunarPathEntry *path_entry,
}
else
{
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, _("Invalid path"));
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, g_strerror (EINVAL));
}
}
@@ -1361,33 +1392,36 @@ thunar_path_entry_set_current_file (ThunarPathEntry *path_entry,
ThunarFile *current_file)
{
ThunarVfsPath *path;
- gchar *uri_string;
- gchar text[THUNAR_VFS_PATH_MAXSTRLEN];
+ gchar *text;
g_return_if_fail (THUNAR_IS_PATH_ENTRY (path_entry));
g_return_if_fail (current_file == NULL || THUNAR_IS_FILE (current_file));
path = (current_file != NULL) ? thunar_file_get_path (current_file) : NULL;
- if (G_UNLIKELY (path == NULL || thunar_vfs_path_to_string (path, text, sizeof (text), NULL) < 0))
+ if (G_UNLIKELY (path == NULL))
{
- gtk_entry_set_text (GTK_ENTRY (path_entry), "");
+ /* invalid file */
+ text = g_strdup ("");
}
- else
+ else if (thunar_vfs_path_get_scheme (path) == THUNAR_VFS_PATH_SCHEME_FILE)
{
- /* check whether the path text is valid UTF8 */
- if (g_utf8_validate (text, -1, NULL))
- {
- /* we'll display the path if we have valid UTF-8 */
- gtk_entry_set_text (GTK_ENTRY (path_entry), text);
- }
- else
+ /* try absolute path, fallback to URI if not valid UTF-8 */
+ text = thunar_vfs_path_dup_string (path);
+ if (!g_utf8_validate (text, -1, NULL))
{
- /* display the full URI */
- uri_string = thunar_vfs_path_dup_uri (path);
- gtk_entry_set_text (GTK_ENTRY (path_entry), uri_string);
- g_free (uri_string);
+ g_free (text);
+ goto uri;
}
}
+ else
+ {
+uri: /* display the URI for the path */
+ text = thunar_vfs_path_dup_uri (path);
+ }
+
+ /* setup the entry text */
+ gtk_entry_set_text (GTK_ENTRY (path_entry), text);
+ g_free (text);
gtk_editable_set_position (GTK_EDITABLE (path_entry), -1);
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index 1dd436e4ecc1ed7b4a4e60cdafeba894450caf3b..0b36682b76a3291188b78bf904bd11bbb0f41997 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -34,11 +34,17 @@
#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-enum-types.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-gtk-extensions.h>
#include <thunar/thunar-pango-extensions.h>
#include <thunar/thunar-permissions-chooser.h>
#include <thunar/thunar-preferences.h>
#include <thunar/thunar-stock.h>
+/* Use native strlcpy() if available */
+#if defined(HAVE_STRLCPY)
+#define g_strlcpy(dst, src, size) (strlcpy ((dst), (src), (size)))
+#endif
+
/* Property identifiers */
@@ -59,54 +65,54 @@ enum
-static void thunar_permissions_chooser_class_init (ThunarPermissionsChooserClass *klass);
-static void thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser);
-static void thunar_permissions_chooser_finalize (GObject *object);
-static void thunar_permissions_chooser_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void thunar_permissions_chooser_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static gint thunar_permissions_chooser_ask_recursive (ThunarPermissionsChooser *chooser);
-static void thunar_permissions_chooser_change_group (ThunarPermissionsChooser *chooser,
- ThunarVfsGroupId gid);
-static void thunar_permissions_chooser_change_mode (ThunarPermissionsChooser *chooser,
- ThunarVfsFileMode dir_mask,
- ThunarVfsFileMode dir_mode,
- ThunarVfsFileMode file_mask,
- ThunarVfsFileMode file_mode);
-static void thunar_permissions_chooser_access_changed (ThunarPermissionsChooser *chooser,
- GtkWidget *combo);
-static void thunar_permissions_chooser_file_changed (ThunarPermissionsChooser *chooser,
- ThunarFile *file);
-static void thunar_permissions_chooser_group_changed (ThunarPermissionsChooser *chooser,
- GtkWidget *combo);
-static void thunar_permissions_chooser_program_toggled (ThunarPermissionsChooser *chooser,
- GtkWidget *button);
-static void thunar_permissions_chooser_fixperm_clicked (ThunarPermissionsChooser *chooser,
- GtkWidget *button);
-static ThunarVfsInteractiveJobResponse thunar_permissions_chooser_job_ask (ThunarPermissionsChooser *chooser,
- const gchar *message,
- ThunarVfsInteractiveJobResponse choices,
- ThunarVfsJob *job);
-static void thunar_permissions_chooser_job_cancel (ThunarPermissionsChooser *chooser);
-static void thunar_permissions_chooser_job_error (ThunarPermissionsChooser *chooser,
- GError *error,
- ThunarVfsJob *job);
-static void thunar_permissions_chooser_job_finished (ThunarPermissionsChooser *chooser,
- ThunarVfsJob *job);
-static void thunar_permissions_chooser_job_percent (ThunarPermissionsChooser *chooser,
- gdouble percent,
- ThunarVfsJob *job);
-static void thunar_permissions_chooser_job_start (ThunarPermissionsChooser *chooser,
- ThunarVfsJob *job,
- gboolean recursive);
-static gboolean thunar_permissions_chooser_row_separator (GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data);
+static void thunar_permissions_chooser_class_init (ThunarPermissionsChooserClass *klass);
+static void thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser);
+static void thunar_permissions_chooser_finalize (GObject *object);
+static void thunar_permissions_chooser_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void thunar_permissions_chooser_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static gint thunar_permissions_chooser_ask_recursive (ThunarPermissionsChooser *chooser);
+static void thunar_permissions_chooser_change_group (ThunarPermissionsChooser *chooser,
+ ThunarVfsGroupId gid);
+static void thunar_permissions_chooser_change_mode (ThunarPermissionsChooser *chooser,
+ ThunarVfsFileMode dir_mask,
+ ThunarVfsFileMode dir_mode,
+ ThunarVfsFileMode file_mask,
+ ThunarVfsFileMode file_mode);
+static void thunar_permissions_chooser_access_changed (ThunarPermissionsChooser *chooser,
+ GtkWidget *combo);
+static void thunar_permissions_chooser_file_changed (ThunarPermissionsChooser *chooser,
+ ThunarFile *file);
+static void thunar_permissions_chooser_group_changed (ThunarPermissionsChooser *chooser,
+ GtkWidget *combo);
+static void thunar_permissions_chooser_program_toggled (ThunarPermissionsChooser *chooser,
+ GtkWidget *button);
+static void thunar_permissions_chooser_fixperm_clicked (ThunarPermissionsChooser *chooser,
+ GtkWidget *button);
+static ThunarVfsJobResponse thunar_permissions_chooser_job_ask (ThunarPermissionsChooser *chooser,
+ const gchar *message,
+ ThunarVfsJobResponse choices,
+ ThunarVfsJob *job);
+static void thunar_permissions_chooser_job_cancel (ThunarPermissionsChooser *chooser);
+static void thunar_permissions_chooser_job_error (ThunarPermissionsChooser *chooser,
+ GError *error,
+ ThunarVfsJob *job);
+static void thunar_permissions_chooser_job_finished (ThunarPermissionsChooser *chooser,
+ ThunarVfsJob *job);
+static void thunar_permissions_chooser_job_percent (ThunarPermissionsChooser *chooser,
+ gdouble percent,
+ ThunarVfsJob *job);
+static void thunar_permissions_chooser_job_start (ThunarPermissionsChooser *chooser,
+ ThunarVfsJob *job,
+ gboolean recursive);
+static gboolean thunar_permissions_chooser_row_separator (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data);
@@ -121,8 +127,6 @@ struct _ThunarPermissionsChooser
ThunarFile *file;
- GtkTooltips *tooltips;
-
/* the main table widget, which contains everything but the job control stuff */
GtkWidget *table;
@@ -230,10 +234,6 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
GtkWidget *hbox;
gint row = 0;
- /* allocate the shared tooltips for the chooser */
- chooser->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (chooser->tooltips));
-
/* setup the chooser */
gtk_container_set_border_width (GTK_CONTAINER (chooser), 12);
@@ -453,7 +453,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_widget_show (hbox);
chooser->fixperm_button = gtk_button_new_with_mnemonic (_("Correct folder permissions..."));
- gtk_tooltips_set_tip (chooser->tooltips, chooser->fixperm_button, _("Click here to automatically fix the folder permissions."), NULL);
+ thunar_gtk_widget_set_tooltip (chooser->fixperm_button, _("Click here to automatically fix the folder permissions."));
g_signal_connect_swapped (G_OBJECT (chooser->fixperm_button), "clicked", G_CALLBACK (thunar_permissions_chooser_fixperm_clicked), chooser);
exo_binding_new (G_OBJECT (chooser->fixperm_button), "visible", G_OBJECT (hbox), "visible");
gtk_box_pack_end (GTK_BOX (hbox), chooser->fixperm_button, FALSE, FALSE, 0);
@@ -469,7 +469,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_box_pack_start (GTK_BOX (hbox), chooser->job_progress, TRUE, TRUE, 0);
button = gtk_button_new ();
- gtk_tooltips_set_tip (chooser->tooltips, button, _("Stop applying permissions recursively."), NULL);
+ thunar_gtk_widget_set_tooltip (button, _("Stop applying permissions recursively."));
g_signal_connect_swapped (G_OBJECT (button), "clicked", G_CALLBACK (thunar_permissions_chooser_job_cancel), chooser);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
@@ -504,9 +504,6 @@ thunar_permissions_chooser_finalize (GObject *object)
/* drop the reference on the file (if any) */
thunar_permissions_chooser_set_file (chooser, NULL);
- /* release the tooltips */
- g_object_unref (G_OBJECT (chooser->tooltips));
-
(*G_OBJECT_CLASS (thunar_permissions_chooser_parent_class)->finalize) (object);
}
@@ -623,8 +620,8 @@ thunar_permissions_chooser_ask_recursive (ThunarPermissionsChooser *chooser)
gtk_widget_show (label);
button = gtk_check_button_new_with_mnemonic (_("Do _not ask me again"));
- gtk_tooltips_set_tip (chooser->tooltips, button, _("If you select this option your choice will be remembered and you won't be asked "
- "again. You can use the preferences dialog to alter your choice afterwards."), NULL);
+ thunar_gtk_widget_set_tooltip (button, _("If you select this option your choice will be remembered and you won't be asked "
+ "again. You can use the preferences dialog to alter your choice afterwards."));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
@@ -1105,99 +1102,29 @@ thunar_permissions_chooser_fixperm_clicked (ThunarPermissionsChooser *chooser,
-static ThunarVfsInteractiveJobResponse
-thunar_permissions_chooser_job_ask (ThunarPermissionsChooser *chooser,
- const gchar *message,
- ThunarVfsInteractiveJobResponse choices,
- ThunarVfsJob *job)
+static ThunarVfsJobResponse
+thunar_permissions_chooser_job_ask (ThunarPermissionsChooser *chooser,
+ const gchar *message,
+ ThunarVfsJobResponse choices,
+ ThunarVfsJob *job)
{
- const gchar *mnemonic;
- GtkWidget *toplevel;
- GtkWidget *question;
- GtkWidget *hbox;
- GtkWidget *image;
- GtkWidget *label;
- GtkWidget *button;
- gint response;
- gint n;
-
- g_return_val_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser), THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (g_utf8_validate (message, -1, NULL), THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (job), THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (chooser->job == job, THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
+ GtkWidget *toplevel;
+
+ g_return_val_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ g_return_val_if_fail (g_utf8_validate (message, -1, NULL), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ g_return_val_if_fail (THUNAR_VFS_IS_JOB (job), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ g_return_val_if_fail (chooser->job == job, THUNAR_VFS_JOB_RESPONSE_CANCEL);
/* be sure to display the progress bar prior to opening the question dialog */
gtk_widget_show_now (chooser->job_progress);
- question = g_object_new (GTK_TYPE_DIALOG,
- "has-separator", FALSE,
- "resizable", FALSE,
- "title", _("Question"),
- NULL);
-
+ /* determine the toplevel window for the chooser */
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (chooser));
- if (G_LIKELY (toplevel != NULL))
- gtk_window_set_transient_for (GTK_WINDOW (question), GTK_WINDOW (toplevel));
-
- hbox = g_object_new (GTK_TYPE_HBOX, "border-width", 12, "spacing", 12, NULL);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (question)->vbox), hbox, FALSE, FALSE, 0);
- gtk_widget_show (hbox);
-
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
- gtk_widget_show (image);
-
- label = g_object_new (GTK_TYPE_LABEL, "label", message, "xalign", 0, "yalign", 0, NULL);
- gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
- gtk_widget_show (label);
-
- /* add the buttons based on the possible choices */
- for (n = 3; n >= 0; --n)
- {
- response = choices & (1 << n);
- if (response == 0)
- continue;
-
- switch (response)
- {
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES:
- mnemonic = _("_Yes");
- break;
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL:
- mnemonic = _("Yes to _all");
- break;
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_NO:
- mnemonic = _("_No");
- break;
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL:
- mnemonic = _("_Cancel");
- break;
-
- default:
- g_assert_not_reached ();
- break;
- }
-
- button = gtk_button_new_with_mnemonic (mnemonic);
- GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
- gtk_dialog_add_action_widget (GTK_DIALOG (question), button, response);
- gtk_widget_show (button);
-
- gtk_dialog_set_default_response (GTK_DIALOG (question), response);
- }
-
- /* run the question */
- response = gtk_dialog_run (GTK_DIALOG (question));
- gtk_widget_destroy (question);
-
- /* transform the result as required */
- if (G_UNLIKELY (response <= 0))
- response = THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL;
+ if (G_UNLIKELY (toplevel == NULL))
+ return THUNAR_VFS_JOB_RESPONSE_CANCEL;
- return response;
+ /* display the question dialog */
+ return thunar_dialogs_show_job_ask (GTK_WINDOW (toplevel), message, choices);
}
@@ -1234,11 +1161,10 @@ thunar_permissions_chooser_job_error (ThunarPermissionsChooser *chooser,
ThunarVfsJob *job)
{
GtkWidget *toplevel;
- GtkWidget *message;
g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
g_return_if_fail (error != NULL && error->message != NULL);
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (job));
+ g_return_if_fail (THUNAR_VFS_IS_JOB (job));
g_return_if_fail (chooser->job == job);
/* be sure to display the progress bar prior to opening the error dialog */
@@ -1250,14 +1176,7 @@ thunar_permissions_chooser_job_error (ThunarPermissionsChooser *chooser,
return;
/* popup the error message dialog */
- message = gtk_message_dialog_new (GTK_WINDOW (toplevel),
- GTK_DIALOG_MODAL
- | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "%s", error->message);
- gtk_dialog_run (GTK_DIALOG (message));
- gtk_widget_destroy (message);
+ thunar_dialogs_show_job_error (GTK_WINDOW (toplevel), error);
}
@@ -1267,7 +1186,7 @@ thunar_permissions_chooser_job_finished (ThunarPermissionsChooser *chooser,
ThunarVfsJob *job)
{
g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (job));
+ g_return_if_fail (THUNAR_VFS_IS_JOB (job));
g_return_if_fail (chooser->job == job);
/* we can just use job_cancel(), since the job is already done */
@@ -1282,7 +1201,7 @@ thunar_permissions_chooser_job_percent (ThunarPermissionsChooser *chooser,
ThunarVfsJob *job)
{
g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (job));
+ g_return_if_fail (THUNAR_VFS_IS_JOB (job));
g_return_if_fail (chooser->job == job);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (chooser->job_progress), percent / 100.0);
@@ -1297,7 +1216,7 @@ thunar_permissions_chooser_job_start (ThunarPermissionsChooser *chooser,
gboolean recursive)
{
g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (job));
+ g_return_if_fail (THUNAR_VFS_IS_JOB (job));
g_return_if_fail (chooser->job == NULL);
/* take a reference to the job and connect signals */
diff --git a/thunar/thunar-preferences-dialog.c b/thunar/thunar-preferences-dialog.c
index 64f05e5bb2f23f78dbe56147604525d4b6750af8..f3efe186b81defbe2a0e63a76b5b8fe44ef73530 100644
--- a/thunar/thunar-preferences-dialog.c
+++ b/thunar/thunar-preferences-dialog.c
@@ -23,12 +23,11 @@
#include <gdk/gdkkeysyms.h>
-#include <exo/exo.h>
-
#include <thunar/thunar-abstract-dialog.h>
#include <thunar/thunar-compact-view.h>
#include <thunar/thunar-details-view.h>
#include <thunar/thunar-enum-types.h>
+#include <thunar/thunar-gtk-extensions.h>
#include <thunar/thunar-icon-view.h>
#include <thunar/thunar-pango-extensions.h>
#include <thunar/thunar-preferences-dialog.h>
@@ -52,9 +51,7 @@ struct _ThunarPreferencesDialogClass
struct _ThunarPreferencesDialog
{
ThunarAbstractDialog __parent__;
-
- ThunarPreferences *preferences;
- GtkTooltips *tooltips;
+ ThunarPreferences *preferences;
};
@@ -218,10 +215,6 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
/* grab a reference on the preferences */
dialog->preferences = thunar_preferences_get ();
- /* allocate new tooltips for this dialog */
- dialog->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (dialog->tooltips));
-
/* configure the dialog properties */
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
@@ -292,14 +285,14 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
button = gtk_check_button_new_with_mnemonic (_("Sort _folders before files"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "misc-folders-first", G_OBJECT (button), "active");
- gtk_tooltips_set_tip (dialog->tooltips, button, _("Select this option to list folders before files when you sort a folder."), NULL);
+ thunar_gtk_widget_set_tooltip (button, _("Select this option to list folders before files when you sort a folder."));
gtk_table_attach (GTK_TABLE (table), button, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (button);
button = gtk_check_button_new_with_mnemonic (_("_Show thumbnails"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "misc-show-thumbnails", G_OBJECT (button), "active");
- gtk_tooltips_set_tip (dialog->tooltips, button, _("Select this option to display previewable files within a "
- "folder as automatically generated thumbnail icons."), NULL);
+ thunar_gtk_widget_set_tooltip (button, _("Select this option to display previewable files within a "
+ "folder as automatically generated thumbnail icons."));
gtk_table_attach (GTK_TABLE (table), button, 0, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (button);
@@ -321,8 +314,8 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
button = gtk_check_button_new_with_mnemonic (_("_Text beside icons"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "misc-text-beside-icons", G_OBJECT (button), "active");
- gtk_tooltips_set_tip (dialog->tooltips, button, _("Select this option to place the icon captions for items "
- "beside the icon rather than below the icon."), NULL);
+ thunar_gtk_widget_set_tooltip (button, _("Select this option to place the icon captions for items "
+ "beside the icon rather than below the icon."));
gtk_table_attach (GTK_TABLE (table), button, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (button);
@@ -382,8 +375,8 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
button = gtk_check_button_new_with_mnemonic (_("Show Icon _Emblems"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "shortcuts-icon-emblems", G_OBJECT (button), "active");
- gtk_tooltips_set_tip (dialog->tooltips, button, _("Select this option to display icon emblems in the shortcuts pane for all folders "
- "for which emblems have been defined in the folders properties dialog."), NULL);
+ thunar_gtk_widget_set_tooltip (button, _("Select this option to display icon emblems in the shortcuts pane for all folders "
+ "for which emblems have been defined in the folders properties dialog."));
gtk_table_attach (GTK_TABLE (table), button, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (button);
@@ -433,8 +426,8 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
button = gtk_check_button_new_with_mnemonic (_("Show Icon E_mblems"));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "tree-icon-emblems", G_OBJECT (button), "active");
- gtk_tooltips_set_tip (dialog->tooltips, button, _("Select this option to display icon emblems in the tree pane for all folders "
- "for which emblems have been defined in the folders properties dialog."), NULL);
+ thunar_gtk_widget_set_tooltip (button, _("Select this option to display icon emblems in the tree pane for all folders "
+ "for which emblems have been defined in the folders properties dialog."));
gtk_table_attach (GTK_TABLE (table), button, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (button);
@@ -496,11 +489,11 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
range = gtk_hscale_new_with_range (0.0, 2000.0, 100.0);
gtk_scale_set_draw_value (GTK_SCALE (range), FALSE);
- gtk_tooltips_set_tip (dialog->tooltips, range, _("When single-click activation is enabled, pausing the mouse pointer over an item "
- "will automatically select that item after the chosen delay. You can disable this "
- "behavior by moving the slider to the left-most position. This behavior may be "
- "useful when single clicks activate items, and you want only to select the item "
- "without activating it."), NULL);
+ thunar_gtk_widget_set_tooltip (range, _("When single-click activation is enabled, pausing the mouse pointer over an item "
+ "will automatically select that item after the chosen delay. You can disable this "
+ "behavior by moving the slider to the left-most position. This behavior may be "
+ "useful when single clicks activate items, and you want only to select the item "
+ "without activating it."));
gtk_box_pack_start (GTK_BOX (ibox), range, FALSE, FALSE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), range);
gtk_widget_show (range);
@@ -606,9 +599,6 @@ thunar_preferences_dialog_finalize (GObject *object)
/* release our reference on the preferences */
g_object_unref (G_OBJECT (dialog->preferences));
- /* release our reference on the tooltips */
- g_object_unref (G_OBJECT (dialog->tooltips));
-
(*G_OBJECT_CLASS (thunar_preferences_dialog_parent_class)->finalize) (object);
}
diff --git a/thunar/thunar-preferences.c b/thunar/thunar-preferences.c
index 8eb5a81aba194f7c4c9931a10206b6515c3d1195..23a81b9ee08091f883458bb4251a305529ddc0df 100644
--- a/thunar/thunar-preferences.c
+++ b/thunar/thunar-preferences.c
@@ -444,7 +444,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
g_param_spec_boolean ("misc-case-sensitive",
"misc-case-sensitive",
"misc-case-sensitive",
- TRUE,
+ FALSE,
EXO_PARAM_READWRITE));
/**
diff --git a/thunar/thunar-private.h b/thunar/thunar-private.h
new file mode 100644
index 0000000000000000000000000000000000000000..70faa47d4f2b913597a4ef13ba5f51f623eecbb7
--- /dev/null
+++ b/thunar/thunar-private.h
@@ -0,0 +1,69 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __THUNAR_PRIVATE_H__
+#define __THUNAR_PRIVATE_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS;
+
+/* support macros for the slice allocator */
+#if GLIB_CHECK_VERSION(2,10,0)
+#define _thunar_slice_alloc(block_size) (g_slice_alloc ((block_size)))
+#define _thunar_slice_alloc0(block_size) (g_slice_alloc0 ((block_size)))
+#define _thunar_slice_free1(block_size, mem_block) G_STMT_START{ g_slice_free1 ((block_size), (mem_block)); }G_STMT_END
+#define _thunar_slice_new(type) (g_slice_new (type))
+#define _thunar_slice_new0(type) (g_slice_new0 (type))
+#define _thunar_slice_free(type, ptr) G_STMT_START{ g_slice_free (type, (ptr)); }G_STMT_END
+#else
+#define _thunar_slice_alloc(block_size) (g_malloc ((block_size)))
+#define _thunar_slice_alloc0(block_size) (g_malloc0 ((block_size)))
+#define _thunar_slice_free1(block_size, mem_block) G_STMT_START{ g_free ((mem_block)); }G_STMT_END
+#define _thunar_slice_new(type) (g_new (type, 1))
+#define _thunar_slice_new0(type) (g_new0 (type, 1))
+#define _thunar_slice_free(type, ptr) G_STMT_START{ g_free ((ptr)); }G_STMT_END
+#endif
+
+/* avoid trivial g_value_get_*() function calls */
+#ifndef G_ENABLE_DEBUG
+#define g_value_get_boolean(v) (((const GValue *) (v))->data[0].v_int)
+#define g_value_get_char(v) (((const GValue *) (v))->data[0].v_int)
+#define g_value_get_uchar(v) (((const GValue *) (v))->data[0].v_uint)
+#define g_value_get_int(v) (((const GValue *) (v))->data[0].v_int)
+#define g_value_get_uint(v) (((const GValue *) (v))->data[0].v_uint)
+#define g_value_get_long(v) (((const GValue *) (v))->data[0].v_long)
+#define g_value_get_ulong(v) (((const GValue *) (v))->data[0].v_ulong)
+#define g_value_get_int64(v) (((const GValue *) (v))->data[0].v_int64)
+#define g_value_get_uint64(v) (((const GValue *) (v))->data[0].v_uint64)
+#define g_value_get_enum(v) (((const GValue *) (v))->data[0].v_long)
+#define g_value_get_flags(v) (((const GValue *) (v))->data[0].v_ulong)
+#define g_value_get_float(v) (((const GValue *) (v))->data[0].v_float)
+#define g_value_get_double(v) (((const GValue *) (v))->data[0].v_double)
+#define g_value_get_string(v) (((const GValue *) (v))->data[0].v_pointer)
+#define g_value_get_param(v) (((const GValue *) (v))->data[0].v_pointer)
+#define g_value_get_boxed(v) (((const GValue *) (v))->data[0].v_pointer)
+#define g_value_get_pointer(v) (((const GValue *) (v))->data[0].v_pointer)
+#define g_value_get_object(v) (((const GValue *) (v))->data[0].v_pointer)
+#endif
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_PRIVATE_H__ */
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index dda4c9cd30601746c7acb0f584d4bd0f19fca4a4..a2265c8a962d96bc9f8ce9fe485a24493fafa47f 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -21,16 +21,7 @@
#include <config.h>
#endif
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-
+#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-pango-extensions.h>
#include <thunar/thunar-progress-dialog.h>
@@ -45,34 +36,34 @@ enum
-static void thunar_progress_dialog_class_init (ThunarProgressDialogClass *klass);
-static void thunar_progress_dialog_init (ThunarProgressDialog *dialog);
-static void thunar_progress_dialog_dispose (GObject *object);
-static void thunar_progress_dialog_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void thunar_progress_dialog_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void thunar_progress_dialog_response (GtkDialog *dialog,
- gint response);
-static ThunarVfsInteractiveJobResponse thunar_progress_dialog_ask (ThunarProgressDialog *dialog,
- const gchar *message,
- ThunarVfsInteractiveJobResponse choices,
- ThunarVfsJob *job);
-static void thunar_progress_dialog_error (ThunarProgressDialog *dialog,
- GError *error,
- ThunarVfsJob *job);
-static void thunar_progress_dialog_finished (ThunarProgressDialog *dialog,
- ThunarVfsJob *job);
-static void thunar_progress_dialog_info_message (ThunarProgressDialog *dialog,
- const gchar *message,
- ThunarVfsJob *job);
-static void thunar_progress_dialog_percent (ThunarProgressDialog *dialog,
- gdouble percent,
- ThunarVfsJob *job);
+static void thunar_progress_dialog_class_init (ThunarProgressDialogClass *klass);
+static void thunar_progress_dialog_init (ThunarProgressDialog *dialog);
+static void thunar_progress_dialog_dispose (GObject *object);
+static void thunar_progress_dialog_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void thunar_progress_dialog_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void thunar_progress_dialog_response (GtkDialog *dialog,
+ gint response);
+static ThunarVfsJobResponse thunar_progress_dialog_ask (ThunarProgressDialog *dialog,
+ const gchar *message,
+ ThunarVfsJobResponse choices,
+ ThunarVfsJob *job);
+static void thunar_progress_dialog_error (ThunarProgressDialog *dialog,
+ GError *error,
+ ThunarVfsJob *job);
+static void thunar_progress_dialog_finished (ThunarProgressDialog *dialog,
+ ThunarVfsJob *job);
+static void thunar_progress_dialog_info_message (ThunarProgressDialog *dialog,
+ const gchar *message,
+ ThunarVfsJob *job);
+static void thunar_progress_dialog_percent (ThunarProgressDialog *dialog,
+ gdouble percent,
+ ThunarVfsJob *job);
@@ -149,13 +140,13 @@ thunar_progress_dialog_class_init (ThunarProgressDialogClass *klass)
/**
* ThunarProgressDialog:job:
*
- * The #ThunarVfsInteractiveJob, whose progress is displayed by
+ * The #ThunarVfsJob, whose progress is displayed by
* this dialog, or %NULL if no job is set.
**/
g_object_class_install_property (gobject_class,
PROP_JOB,
g_param_spec_object ("job", "job", "job",
- THUNAR_VFS_TYPE_INTERACTIVE_JOB,
+ THUNAR_VFS_TYPE_JOB,
EXO_PARAM_READWRITE));
}
@@ -271,154 +262,22 @@ thunar_progress_dialog_set_property (GObject *object,
-static ThunarVfsInteractiveJobResponse
-thunar_progress_dialog_ask (ThunarProgressDialog *dialog,
- const gchar *message,
- ThunarVfsInteractiveJobResponse choices,
- ThunarVfsJob *job)
+static ThunarVfsJobResponse
+thunar_progress_dialog_ask (ThunarProgressDialog *dialog,
+ const gchar *message,
+ ThunarVfsJobResponse choices,
+ ThunarVfsJob *job)
{
- const gchar *mnemonic;
- const gchar *messagep;
- const gchar *stock_id;
- GtkWidget *question;
- GtkWidget *hbox;
- GtkWidget *vbox;
- GtkWidget *image;
- GtkWidget *label;
- GtkWidget *button;
- gchar *title;
- gchar *text;
- gint response;
- gint n;
-
- g_return_val_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog), THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (g_utf8_validate (message, -1, NULL), THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (job), THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (dialog->job == job, THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL);
+ g_return_val_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ g_return_val_if_fail (g_utf8_validate (message, -1, NULL), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ g_return_val_if_fail (THUNAR_VFS_IS_JOB (job), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ g_return_val_if_fail (dialog->job == job, THUNAR_VFS_JOB_RESPONSE_CANCEL);
/* be sure to display the progress dialog prior to opening the question dialog */
gtk_widget_show_now (GTK_WIDGET (dialog));
- question = g_object_new (GTK_TYPE_DIALOG,
- "has-separator", FALSE,
- "resizable", FALSE,
- "title", _("Question"),
- NULL);
- gtk_window_set_transient_for (GTK_WINDOW (question), GTK_WINDOW (dialog));
-
- hbox = gtk_hbox_new (FALSE, 12);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (question)->vbox), hbox, FALSE, FALSE, 0);
- gtk_widget_show (hbox);
-
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
- gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
- gtk_widget_show (image);
-
- vbox = gtk_vbox_new (FALSE, 12);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
- gtk_widget_show (vbox);
-
- /* split the message */
- messagep = strstr (message, "\n\n");
- if (G_LIKELY (messagep != NULL))
- {
- title = g_strndup (message, messagep - message);
- text = g_strdup (messagep + 2);
- }
- else
- {
- title = g_strdup (message);
- text = NULL;
- }
-
- label = gtk_label_new (title);
- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_label_set_selectable (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.0f);
- gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
- gtk_widget_show (label);
-
- /* check if we have two parts */
- if (G_LIKELY (text != NULL))
- {
- /* make the title bold */
- gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
-
- /* add the text */
- label = gtk_label_new (text);
- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_label_set_selectable (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.0f);
- gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
- gtk_widget_show (label);
- }
-
- /* cleanup */
- g_free (title);
- g_free (text);
-
- /* add the buttons based on the possible choices */
- for (n = 3; n >= 0; --n)
- {
- response = choices & (1 << n);
- if (response == 0)
- continue;
-
- switch (response)
- {
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES:
- mnemonic = _("_Yes");
- stock_id = GTK_STOCK_YES;
- break;
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_YES_ALL:
- mnemonic = _("Yes to _all");
- stock_id = NULL;
- break;
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_NO:
- mnemonic = _("_No");
- stock_id = GTK_STOCK_NO;
- break;
-
- case THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL:
- mnemonic = _("_Cancel");
- stock_id = GTK_STOCK_CANCEL;
- break;
- break;
-
- default:
- g_assert_not_reached ();
- break;
- }
-
- button = gtk_button_new_with_mnemonic (mnemonic);
- GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
- gtk_dialog_add_action_widget (GTK_DIALOG (question), button, response);
- gtk_widget_show (button);
-
- /* check if we should add an image to the button */
- if (G_LIKELY (stock_id != NULL))
- {
- image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (button), image);
- gtk_widget_show (image);
- }
-
- gtk_dialog_set_default_response (GTK_DIALOG (question), response);
- }
-
- /* run the question */
- response = gtk_dialog_run (GTK_DIALOG (question));
- gtk_widget_destroy (question);
-
- /* transform the result as required */
- if (G_UNLIKELY (response <= 0))
- response = THUNAR_VFS_INTERACTIVE_JOB_RESPONSE_CANCEL;
-
- return response;
+ /* display the question dialog */
+ return thunar_dialogs_show_job_ask (GTK_WINDOW (dialog), message, choices);
}
@@ -428,24 +287,16 @@ thunar_progress_dialog_error (ThunarProgressDialog *dialog,
GError *error,
ThunarVfsJob *job)
{
- GtkWidget *message;
-
g_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
g_return_if_fail (error != NULL && error->message != NULL);
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (job));
+ g_return_if_fail (THUNAR_VFS_IS_JOB (job));
g_return_if_fail (dialog->job == job);
/* be sure to display the progress dialog prior to opening the error dialog */
gtk_widget_show_now (GTK_WIDGET (dialog));
- message = gtk_message_dialog_new (GTK_WINDOW (dialog),
- GTK_DIALOG_MODAL |
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "%s", error->message);
- gtk_dialog_run (GTK_DIALOG (message));
- gtk_widget_destroy (message);
+ /* display the error message */
+ thunar_dialogs_show_job_error (GTK_WINDOW (dialog), error);
}
@@ -455,7 +306,7 @@ thunar_progress_dialog_finished (ThunarProgressDialog *dialog,
ThunarVfsJob *job)
{
g_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (job));
+ g_return_if_fail (THUNAR_VFS_IS_JOB (job));
g_return_if_fail (dialog->job == job);
gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
@@ -470,7 +321,7 @@ thunar_progress_dialog_info_message (ThunarProgressDialog *dialog,
{
g_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
g_return_if_fail (g_utf8_validate (message, -1, NULL));
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (job));
+ g_return_if_fail (THUNAR_VFS_IS_JOB (job));
g_return_if_fail (dialog->job == job);
gtk_label_set_text (GTK_LABEL (dialog->progress_label), message);
@@ -500,7 +351,7 @@ thunar_progress_dialog_percent (ThunarProgressDialog *dialog,
g_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
g_return_if_fail (percent >= 0.0 && percent <= 100.0);
- g_return_if_fail (THUNAR_VFS_IS_INTERACTIVE_JOB (job));
+ g_return_if_fail (THUNAR_VFS_IS_JOB (job));
g_return_if_fail (dialog->job == job);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (dialog->progress_bar), percent / 100.0);
@@ -590,7 +441,7 @@ thunar_progress_dialog_new (void)
/**
* thunar_progress_dialog_new_with_job:
- * @job : a #ThunarVfsInteractiveJob or %NULL.
+ * @job : a #ThunarVfsJob or %NULL.
*
* Allocates a new #ThunarProgressDialog and associates it with
* the @job.
@@ -600,7 +451,7 @@ thunar_progress_dialog_new (void)
GtkWidget*
thunar_progress_dialog_new_with_job (ThunarVfsJob *job)
{
- g_return_val_if_fail (job == NULL || THUNAR_VFS_IS_INTERACTIVE_JOB (job), NULL);
+ g_return_val_if_fail (job == NULL || THUNAR_VFS_IS_JOB (job), NULL);
return g_object_new (THUNAR_TYPE_PROGRESS_DIALOG, "job", job, NULL);
}
@@ -610,7 +461,7 @@ thunar_progress_dialog_new_with_job (ThunarVfsJob *job)
* thunar_progress_dialog_get_job:
* @dialog : a #ThunarProgressDialog.
*
- * Returns the #ThunarVfsInteractiveJob associated with @dialog
+ * Returns the #ThunarVfsJob associated with @dialog
* or %NULL if no job is currently associated with @dialog.
*
* Return value: the job associated with @dialog or %NULL.
@@ -627,7 +478,7 @@ thunar_progress_dialog_get_job (ThunarProgressDialog *dialog)
/**
* thunar_progress_dialog_set_job:
* @dialog : a #ThunarProgressDialog.
- * @job : a #ThunarVfsInteractiveJob or %NULL.
+ * @job : a #ThunarVfsJob or %NULL.
*
* Associates @job with @dialog.
**/
@@ -636,7 +487,7 @@ thunar_progress_dialog_set_job (ThunarProgressDialog *dialog,
ThunarVfsJob *job)
{
g_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
- g_return_if_fail (job == NULL || THUNAR_VFS_IS_INTERACTIVE_JOB (job));
+ g_return_if_fail (job == NULL || THUNAR_VFS_IS_JOB (job));
/* check if we're already on that job */
if (G_UNLIKELY (dialog->job == job))
diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c
index a75d32ef528bad24acb82a04563cec9033e7bf17..ee53f876b5e077bd6b78221ea1b096268bc505db 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -111,11 +111,14 @@ struct _ThunarPropertiesDialog
GtkWidget *kind_label;
GtkWidget *openwith_chooser;
GtkWidget *link_label;
+ GtkWidget *origin_label;
+ GtkWidget *deleted_label;
GtkWidget *modified_label;
GtkWidget *accessed_label;
GtkWidget *freespace_label;
GtkWidget *volume_image;
GtkWidget *volume_label;
+ GtkWidget *permissions_chooser;
gint rename_idle_id;
};
@@ -329,6 +332,24 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
++row;
+ /* TRANSLATORS: Try to come up with a short translation of "Original Path" (which is the path
+ * where the trashed file/folder was located before it was moved to the trash), otherwise the
+ * properties dialog width will be messed up.
+ */
+ label = gtk_label_new (_("Original Path:"));
+ gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
+ gtk_widget_show (label);
+
+ dialog->origin_label = g_object_new (GTK_TYPE_LABEL, "ellipsize", PANGO_ELLIPSIZE_START, "xalign", 0.0f, NULL);
+ gtk_label_set_selectable (GTK_LABEL (dialog->origin_label), TRUE);
+ exo_binding_new (G_OBJECT (dialog->origin_label), "visible", G_OBJECT (label), "visible");
+ gtk_table_attach (GTK_TABLE (table), dialog->origin_label, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+ gtk_widget_show (dialog->origin_label);
+
+ ++row;
+
spacer = g_object_new (GTK_TYPE_ALIGNMENT, "height-request", 12, NULL);
gtk_table_attach (GTK_TABLE (table), spacer, 0, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
@@ -338,8 +359,22 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
/*
- Third box (modified, accessed)
+ Third box (deleted, modified, accessed)
*/
+ label = gtk_label_new (_("Deleted:"));
+ gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
+ gtk_widget_show (label);
+
+ dialog->deleted_label = g_object_new (GTK_TYPE_LABEL, "xalign", 0.0f, NULL);
+ gtk_label_set_selectable (GTK_LABEL (dialog->deleted_label), TRUE);
+ exo_binding_new (G_OBJECT (dialog->deleted_label), "visible", G_OBJECT (label), "visible");
+ gtk_table_attach (GTK_TABLE (table), dialog->deleted_label, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
+ gtk_widget_show (dialog->deleted_label);
+
+ ++row;
+
label = gtk_label_new (_("Modified:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
@@ -453,10 +488,10 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
Permissions chooser
*/
label = gtk_label_new (_("Permissions"));
- chooser = thunar_permissions_chooser_new ();
- exo_binding_new (G_OBJECT (dialog), "file", G_OBJECT (chooser), "file");
- gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), chooser, label);
- gtk_widget_show (chooser);
+ dialog->permissions_chooser = thunar_permissions_chooser_new ();
+ exo_binding_new (G_OBJECT (dialog), "file", G_OBJECT (dialog->permissions_chooser), "file");
+ gtk_notebook_append_page (GTK_NOTEBOOK (dialog->notebook), dialog->permissions_chooser, label);
+ gtk_widget_show (dialog->permissions_chooser);
gtk_widget_show (label);
@@ -749,6 +784,34 @@ thunar_properties_dialog_update (ThunarPropertiesDialog *dialog)
gtk_widget_hide (dialog->link_label);
}
+ /* update the original path */
+ str = thunar_file_get_original_path (dialog->file);
+ if (G_UNLIKELY (str != NULL))
+ {
+ display_name = g_filename_display_name (str);
+ gtk_label_set_text (GTK_LABEL (dialog->origin_label), display_name);
+ gtk_widget_show (dialog->origin_label);
+ g_free (display_name);
+ g_free (str);
+ }
+ else
+ {
+ gtk_widget_hide (dialog->origin_label);
+ }
+
+ /* update the deleted time */
+ str = thunar_file_get_deletion_date (dialog->file);
+ if (G_LIKELY (str != NULL))
+ {
+ gtk_label_set_text (GTK_LABEL (dialog->deleted_label), str);
+ gtk_widget_show (dialog->deleted_label);
+ g_free (str);
+ }
+ else
+ {
+ gtk_widget_hide (dialog->deleted_label);
+ }
+
/* update the modified time */
str = thunar_file_get_date_string (dialog->file, THUNAR_FILE_DATE_MODIFIED);
if (G_LIKELY (str != NULL))
@@ -789,7 +852,7 @@ thunar_properties_dialog_update (ThunarPropertiesDialog *dialog)
}
/* update the volume */
- volume = thunar_file_get_volume (dialog->file, dialog->volume_manager);
+ volume = thunar_file_is_local (dialog->file) ? thunar_file_get_volume (dialog->file, dialog->volume_manager) : NULL;
if (G_LIKELY (volume != NULL))
{
icon_name = thunar_vfs_volume_lookup_icon_name (volume, icon_theme);
@@ -951,6 +1014,12 @@ thunar_properties_dialog_set_file (ThunarPropertiesDialog *dialog,
/* update the provider property pages */
thunar_properties_dialog_update_providers (dialog);
+
+ /* hide the permissions chooser for trashed files */
+ if (thunar_file_is_trashed (file))
+ gtk_widget_hide (dialog->permissions_chooser);
+ else
+ gtk_widget_show (dialog->permissions_chooser);
}
/* tell everybody that we have a new file here */
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index 80e3de6cd8382ef785e5cf20ef28dd332d431bf0..95826a648f2661ccd60d6ea94ea6d8a15cc13773 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -142,8 +142,6 @@ struct _ThunarRenamerDialog
ThunarLauncher *launcher;
- GtkTooltips *tooltips;
-
GtkActionGroup *action_group;
GtkUIManager *ui_manager;
@@ -341,10 +339,6 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
/* allocate a new bulk rename model */
renamer_dialog->model = thunar_renamer_model_new ();
- /* allocate tooltips for the dialog */
- renamer_dialog->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (renamer_dialog->tooltips));
-
/* determine the list of available renamers (using the renamer providers) */
provider_factory = thunarx_provider_factory_get_default ();
providers = thunarx_provider_factory_list_providers (provider_factory, THUNARX_TYPE_RENAMER_PROVIDER);
@@ -373,7 +367,7 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
button = gtk_dialog_add_button (GTK_DIALOG (renamer_dialog), _("_Rename Files"), GTK_RESPONSE_ACCEPT);
exo_binding_new (G_OBJECT (renamer_dialog->model), "can-rename", G_OBJECT (button), "sensitive");
gtk_dialog_set_default_response (GTK_DIALOG (renamer_dialog), GTK_RESPONSE_ACCEPT);
- gtk_tooltips_set_tip (renamer_dialog->tooltips, button, _("Click here to actually rename the files listed above to their new names."), NULL);
+ thunar_gtk_widget_set_tooltip (button, _("Click here to actually rename the files listed above to their new names."));
/* setup the action group for this dialog */
renamer_dialog->action_group = gtk_action_group_new ("ThunarRenamerDialog");
@@ -510,7 +504,7 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
/* add a "Help" button */
button = gtk_button_new ();
- gtk_tooltips_set_tip (renamer_dialog->tooltips, button, _("Click here to view the documentation for the selected rename operation."), NULL);
+ thunar_gtk_widget_set_tooltip (button, _("Click here to view the documentation for the selected rename operation."));
g_signal_connect_swapped (G_OBJECT (button), "clicked", G_CALLBACK (thunar_renamer_dialog_help), renamer_dialog);
gtk_box_pack_start (GTK_BOX (rbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
@@ -662,9 +656,6 @@ thunar_renamer_dialog_finalize (GObject *object)
g_object_unref (G_OBJECT (renamer_dialog->action_group));
g_object_unref (G_OBJECT (renamer_dialog->ui_manager));
- /* release the shared tooltips */
- g_object_unref (G_OBJECT (renamer_dialog->tooltips));
-
/* release our bulk rename model */
g_object_unref (G_OBJECT (renamer_dialog->model));
diff --git a/thunar/thunar-renamer-model.c b/thunar/thunar-renamer-model.c
index 78d3d7450dd50eee85e32b0ba7135749a86d70f2..2edc5c968d7681edc88603e35c05d69dcb618ba6 100644
--- a/thunar/thunar-renamer-model.c
+++ b/thunar/thunar-renamer-model.c
@@ -30,6 +30,7 @@
#include <thunar/thunar-file-monitor.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-renamer-model.h>
@@ -989,7 +990,7 @@ thunar_renamer_model_item_new (ThunarFile *file)
{
ThunarRenamerModelItem *item;
- item = g_new0 (ThunarRenamerModelItem, 1);
+ item = _thunar_slice_new0 (ThunarRenamerModelItem);
item->info = thunar_vfs_info_ref (thunar_file_get_info (file));
item->file = g_object_ref (G_OBJECT (file));
item->dirty = TRUE;
@@ -1005,7 +1006,7 @@ thunar_renamer_model_item_free (ThunarRenamerModelItem *item)
g_object_unref (G_OBJECT (item->file));
thunar_vfs_info_unref (item->info);
g_free (item->name);
- g_free (item);
+ _thunar_slice_free (ThunarRenamerModelItem, item);
}
diff --git a/thunar/thunar-renamer-pair.c b/thunar/thunar-renamer-pair.c
index 35f57fbfbc10323a27e406d8e33f7a50085fa925..2002817af5b22b9c1d826ddf49bb24a3b2b4cbce 100644
--- a/thunar/thunar-renamer-pair.c
+++ b/thunar/thunar-renamer-pair.c
@@ -21,6 +21,7 @@
#include <config.h>
#endif
+#include <thunar/thunar-private.h>
#include <thunar/thunar-renamer-pair.h>
@@ -65,11 +66,7 @@ thunar_renamer_pair_new (ThunarFile *file,
g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
g_return_val_if_fail (g_utf8_validate (name, -1, NULL), NULL);
-#if GLIB_CHECK_VERSION(2,10,0)
- renamer_pair = g_slice_new (ThunarRenamerPair);
-#else
- renamer_pair = g_new (ThunarRenamerPair, 1);
-#endif
+ renamer_pair = _thunar_slice_new (ThunarRenamerPair);
renamer_pair->file = g_object_ref (G_OBJECT (file));
renamer_pair->name = g_strdup (name);
@@ -112,11 +109,7 @@ thunar_renamer_pair_free (ThunarRenamerPair *renamer_pair)
{
g_object_unref (G_OBJECT (renamer_pair->file));
g_free (renamer_pair->name);
-#if GLIB_CHECK_VERSION(2,10,0)
- g_slice_free (ThunarRenamerPair, renamer_pair);
-#else
- g_free (renamer_pair);
-#endif
+ _thunar_slice_free (ThunarRenamerPair, renamer_pair);
}
}
diff --git a/thunar/thunar-sendto-model.c b/thunar/thunar-sendto-model.c
index ca3e31d9cc84e79ee3af2a0b7eb4aa0d7609dc0c..48ab2b732fd0697b436e11550761f613027c711b 100644
--- a/thunar/thunar-sendto-model.c
+++ b/thunar/thunar-sendto-model.c
@@ -308,6 +308,19 @@ thunar_sendto_model_get_matching (ThunarSendtoModel *sendto_model,
if ((flags & THUNAR_VFS_MIME_HANDLER_SUPPORTS_MULTI) == 0 && files->next != NULL)
continue;
+ /* ignore the handler if it doesn't support URIs, but we don't have a local file */
+ if ((flags & THUNAR_VFS_MIME_HANDLER_SUPPORTS_URIS) == 0)
+ {
+ /* check if we have any non-local files */
+ for (fp = files; fp != NULL; fp = fp->next)
+ if (!thunar_file_is_local (fp->data))
+ break;
+
+ /* check if the test failed */
+ if (G_UNLIKELY (fp != NULL))
+ continue;
+ }
+
/* check if we need to test mime types for this handler */
mime_types = thunar_vfs_mime_application_get_mime_types (hp->data);
if (G_LIKELY (mime_types != NULL && *mime_types != NULL))
diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
index 6535f842828abb672bd839db3d8f93b2db820841..3c74953187ceb3ef0c01f4c63422381f61177320 100644
--- a/thunar/thunar-shortcuts-model.c
+++ b/thunar/thunar-shortcuts-model.c
@@ -29,8 +29,9 @@
#include <stdlib.h>
#endif
-#include <thunar/thunar-shortcuts-model.h>
#include <thunar/thunar-file.h>
+#include <thunar/thunar-shortcuts-model.h>
+#include <thunar/thunar-private.h>
@@ -245,14 +246,16 @@ thunar_shortcuts_model_drag_source_init (GtkTreeDragSourceIface *iface)
static void
thunar_shortcuts_model_init (ThunarShortcutsModel *model)
{
- ThunarShortcut *shortcut;
ThunarVfsVolume *volume;
+ ThunarShortcut *shortcut;
+ ThunarVfsPath *system_path_list[3] = { thunar_vfs_path_get_for_home (), thunar_vfs_path_get_for_trash (), thunar_vfs_path_get_for_root () };
ThunarVfsPath *fhome;
ThunarVfsPath *fpath;
GtkTreePath *path;
ThunarFile *file;
GList *volumes;
GList *lp;
+ guint n;
model->stamp = g_random_int ();
@@ -264,39 +267,26 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
/* will be used to append the shortcuts to the list */
path = gtk_tree_path_new_from_indices (0, -1);
- /* append the 'Home' shortcut */
- fpath = thunar_vfs_path_get_for_home ();
- file = thunar_file_get_for_path (fpath, NULL);
- if (G_LIKELY (file != NULL))
+ /* append the system defined items ('Home', 'Trash', 'File System') */
+ for (n = 0; n < G_N_ELEMENTS (system_path_list); ++n)
{
- shortcut = g_new (ThunarShortcut, 1);
- shortcut->type = THUNAR_SHORTCUT_SYSTEM_DEFINED;
- shortcut->file = file;
- shortcut->name = NULL;
- shortcut->volume = NULL;
-
- /* append the shortcut to the list */
- thunar_shortcuts_model_add_shortcut (model, shortcut, path);
- gtk_tree_path_next (path);
- }
- thunar_vfs_path_unref (fpath);
+ /* determine the file for the path */
+ file = thunar_file_get_for_path (system_path_list[n], NULL);
+ if (G_LIKELY (file != NULL))
+ {
+ /* create the shortcut */
+ shortcut = _thunar_slice_new0 (ThunarShortcut);
+ shortcut->type = THUNAR_SHORTCUT_SYSTEM_DEFINED;
+ shortcut->file = file;
- /* append the 'Filesystem' shortcut */
- fpath = thunar_vfs_path_get_for_root ();
- file = thunar_file_get_for_path (fpath, NULL);
- if (G_LIKELY (file != NULL))
- {
- shortcut = g_new (ThunarShortcut, 1);
- shortcut->type = THUNAR_SHORTCUT_SYSTEM_DEFINED;
- shortcut->file = file;
- shortcut->name = NULL;
- shortcut->volume = NULL;
-
- /* append the shortcut to the list */
- thunar_shortcuts_model_add_shortcut (model, shortcut, path);
- gtk_tree_path_next (path);
+ /* append the shortcut to the list */
+ thunar_shortcuts_model_add_shortcut (model, shortcut, path);
+ gtk_tree_path_next (path);
+ }
+
+ /* release the system defined path */
+ thunar_vfs_path_unref (system_path_list[n]);
}
- thunar_vfs_path_unref (fpath);
/* prepend the removable media volumes */
volumes = thunar_vfs_volume_manager_get_volumes (model->volume_manager);
@@ -314,10 +304,8 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
/* generate the shortcut (w/o a file, else we might
* prevent the volume from being unmounted)
*/
- shortcut = g_new (ThunarShortcut, 1);
+ shortcut = _thunar_slice_new0 (ThunarShortcut);
shortcut->type = THUNAR_SHORTCUT_REMOVABLE_MEDIA;
- shortcut->file = NULL;
- shortcut->name = NULL;
shortcut->volume = volume;
/* link the shortcut to the list */
@@ -333,7 +321,7 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
/* prepend the row separator (only supported with Gtk+ 2.6) */
#if GTK_CHECK_VERSION(2,6,0)
- shortcut = g_new0 (ThunarShortcut, 1);
+ shortcut = _thunar_slice_new0 (ThunarShortcut);
shortcut->type = THUNAR_SHORTCUT_SEPARATOR;
thunar_shortcuts_model_add_shortcut (model, shortcut, path);
gtk_tree_path_next (path);
@@ -802,10 +790,9 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model)
}
/* create the shortcut entry */
- shortcut = g_new (ThunarShortcut, 1);
+ shortcut = _thunar_slice_new0 (ThunarShortcut);
shortcut->type = THUNAR_SHORTCUT_USER_DEFINED;
shortcut->file = file;
- shortcut->volume = NULL;
shortcut->name = (*name != '\0') ? g_strdup (name) : NULL;
/* append the shortcut to the list */
@@ -1038,10 +1025,8 @@ thunar_shortcuts_model_volume_changed (ThunarVfsVolume *volume,
}
/* allocate a new shortcut */
- shortcut = g_new (ThunarShortcut, 1);
+ shortcut = _thunar_slice_new0 (ThunarShortcut);
shortcut->type = THUNAR_SHORTCUT_REMOVABLE_MEDIA;
- shortcut->file = NULL;
- shortcut->name = NULL;
shortcut->volume = volume;
/* the volume is present now, so we have to display it */
@@ -1194,8 +1179,11 @@ thunar_shortcut_free (ThunarShortcut *shortcut,
g_object_unref (G_OBJECT (shortcut->volume));
}
+ /* release the shortcut name */
g_free (shortcut->name);
- g_free (shortcut);
+
+ /* release the shortcut itself */
+ _thunar_slice_free (ThunarShortcut, shortcut);
}
@@ -1348,7 +1336,7 @@ thunar_shortcuts_model_add (ThunarShortcutsModel *model,
return;
/* create the new shortcut that will be inserted */
- shortcut = g_new0 (ThunarShortcut, 1);
+ shortcut = _thunar_slice_new0 (ThunarShortcut);
shortcut->type = THUNAR_SHORTCUT_USER_DEFINED;
shortcut->file = g_object_ref (G_OBJECT (file));
diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index 6911458831659209970caaede163a076f5df9f88..a9df1294c20d2936198324e16f4d8ba86910502f 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -110,6 +110,7 @@ static void thunar_shortcuts_view_drop_uri_list (ThunarShortcu
GtkTreePath *dst_path);
static void thunar_shortcuts_view_open (ThunarShortcutsView *view);
static void thunar_shortcuts_view_open_in_new_window (ThunarShortcutsView *view);
+static void thunar_shortcuts_view_empty_trash (ThunarShortcutsView *view);
static gboolean thunar_shortcuts_view_eject (ThunarShortcutsView *view);
static gboolean thunar_shortcuts_view_mount (ThunarShortcutsView *view);
static gboolean thunar_shortcuts_view_unmount (ThunarShortcutsView *view);
@@ -847,6 +848,20 @@ thunar_shortcuts_view_context_menu (ThunarShortcutsView *view,
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
}
+ else if (G_UNLIKELY (file != NULL && thunar_file_is_trashed (file) && thunar_file_is_root (file)))
+ {
+ /* append the "Empty Trash" menu action */
+ item = gtk_image_menu_item_new_with_mnemonic (_("_Empty Trash"));
+ gtk_widget_set_sensitive (item, (thunar_file_get_size (file) > 0));
+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_empty_trash), view);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
+
+ /* append a menu separator */
+ item = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
+ }
/* append the remove menu item */
item = gtk_image_menu_item_new_with_mnemonic (_("_Remove Shortcut"));
@@ -1230,6 +1245,21 @@ thunar_shortcuts_view_open_in_new_window (ThunarShortcutsView *view)
+static void
+thunar_shortcuts_view_empty_trash (ThunarShortcutsView *view)
+{
+ ThunarApplication *application;
+
+ g_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
+
+ /* empty the trash bin (asking the user first) */
+ application = thunar_application_get ();
+ thunar_application_empty_trash (application, GTK_WIDGET (view));
+ g_object_unref (G_OBJECT (application));
+}
+
+
+
static gboolean
thunar_shortcuts_view_eject (ThunarShortcutsView *view)
{
diff --git a/thunar/thunar-size-label.c b/thunar/thunar-size-label.c
index a50c0cec213cd5e3eeb1e0e389fb56e8f781461e..84a893aeea5273d92fe1a0eed826ca675454e3a4 100644
--- a/thunar/thunar-size-label.c
+++ b/thunar/thunar-size-label.c
@@ -87,8 +87,6 @@ struct _ThunarSizeLabel
ThunarFile *file;
- GtkTooltips *tooltips;
-
GtkWidget *label;
GtkWidget *throbber;
@@ -166,10 +164,6 @@ thunar_size_label_init (ThunarSizeLabel *size_label)
size_label->animate_timer_id = -1;
- /* allocate shared tooltips */
- size_label->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (size_label->tooltips));
-
gtk_widget_push_composite_child ();
/* configure the box */
@@ -179,7 +173,7 @@ thunar_size_label_init (ThunarSizeLabel *size_label)
ebox = gtk_event_box_new ();
gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE);
g_signal_connect (G_OBJECT (ebox), "button-press-event", G_CALLBACK (thunar_size_label_button_press_event), size_label);
- gtk_tooltips_set_tip (size_label->tooltips, ebox, _("Click here to stop calculating the total size of the folder."), NULL);
+ thunar_gtk_widget_set_tooltip (ebox, _("Click here to stop calculating the total size of the folder."));
gtk_box_pack_start (GTK_BOX (size_label), ebox, FALSE, FALSE, 0);
gtk_widget_show (ebox);
@@ -222,9 +216,6 @@ thunar_size_label_finalize (GObject *object)
if (G_UNLIKELY (size_label->animate_timer_id >= 0))
g_source_remove (size_label->animate_timer_id);
- /* release shared tooltips */
- g_object_unref (G_OBJECT (size_label->tooltips));
-
(*G_OBJECT_CLASS (thunar_size_label_parent_class)->finalize) (object);
}
diff --git a/thunar/thunar-standard-view-ui.xml b/thunar/thunar-standard-view-ui.xml
index b8eb003b27b130a051686d81df3ef0b66044c28b..96c4e99b01ede1131c2aced01d891eec8dff2af7 100644
--- a/thunar/thunar-standard-view-ui.xml
+++ b/thunar/thunar-standard-view-ui.xml
@@ -36,6 +36,7 @@
<menuitem action="duplicate" />
<menuitem action="make-link" />
<menuitem action="rename" />
+ <menuitem action="restore" />
</placeholder>
</menu>
</menubar>
@@ -49,6 +50,7 @@
</placeholder>
<placeholder name="placeholder-edit-actions">
<menuitem action="rename" />
+ <menuitem action="restore" />
</placeholder>
<placeholder name="placeholder-file-actions">
<menuitem action="properties" />
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index bf86b24277b9507e1f50c06e3d7984e10c1f067d..8238759c0b54345d50a7ce2b19997f2af9abd0fc 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -183,6 +183,8 @@ static void thunar_standard_view_action_make_link (Gtk
ThunarStandardView *standard_view);
static void thunar_standard_view_action_rename (GtkAction *action,
ThunarStandardView *standard_view);
+static void thunar_standard_view_action_restore (GtkAction *action,
+ ThunarStandardView *standard_view);
static GClosure *thunar_standard_view_new_files_closure (ThunarStandardView *standard_view);
static void thunar_standard_view_new_files (ThunarVfsJob *job,
GList *path_list,
@@ -266,6 +268,7 @@ struct _ThunarStandardViewPrivate
GtkAction *action_duplicate;
GtkAction *action_make_link;
GtkAction *action_rename;
+ GtkAction *action_restore;
/* support for file manager extensions */
ThunarxProviderFactory *provider_factory;
@@ -320,7 +323,8 @@ static const GtkActionEntry action_entries[] =
{ "select-by-pattern", NULL, N_ ("Select _by Pattern..."), "<control>S", N_ ("Select all files that match a certain pattern"), G_CALLBACK (thunar_standard_view_action_select_by_pattern), },
{ "duplicate", NULL, N_ ("Du_plicate"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_duplicate), },
{ "make-link", NULL, N_ ("Ma_ke Link"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_make_link), },
- { "rename", NULL, N_ ("_Rename..."), "F2", N_ ("Rename the selected file"), G_CALLBACK (thunar_standard_view_action_rename), },
+ { "rename", NULL, N_ ("_Rename..."), "F2", NULL, G_CALLBACK (thunar_standard_view_action_rename), },
+ { "restore", NULL, N_ ("_Restore"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_restore), },
};
/* Target types for dragging from the view */
@@ -577,6 +581,7 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
standard_view->priv->action_duplicate = gtk_action_group_get_action (standard_view->action_group, "duplicate");
standard_view->priv->action_make_link = gtk_action_group_get_action (standard_view->action_group, "make-link");
standard_view->priv->action_rename = gtk_action_group_get_action (standard_view->action_group, "rename");
+ standard_view->priv->action_restore = gtk_action_group_get_action (standard_view->action_group, "restore");
/* add the "Create Document" sub menu action */
standard_view->priv->action_create_document = thunar_templates_action_new ("create-document", _("Create _Document"));
@@ -1114,6 +1119,7 @@ thunar_standard_view_set_current_directory (ThunarNavigator *navigator,
{
ThunarStandardView *standard_view = THUNAR_STANDARD_VIEW (navigator);
ThunarFolder *folder;
+ gboolean trashed;
g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
g_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
@@ -1166,6 +1172,19 @@ thunar_standard_view_set_current_directory (ThunarNavigator *navigator,
/* reconnect our model to the view */
g_object_set (G_OBJECT (GTK_BIN (standard_view)->child), "model", standard_view->model, NULL);
+ /* check if the new directory is in the trash */
+ trashed = thunar_file_is_trashed (current_directory);
+
+ /* update the "Create Folder"/"Create Document" actions */
+ gtk_action_set_visible (standard_view->priv->action_create_folder, !trashed);
+ gtk_action_set_visible (standard_view->priv->action_create_document, !trashed);
+
+ /* update the "Rename" action */
+ gtk_action_set_visible (standard_view->priv->action_rename, !trashed);
+
+ /* update the "Restore" action */
+ gtk_action_set_visible (standard_view->priv->action_restore, trashed);
+
/* notify all listeners about the new/old current directory */
g_object_notify (G_OBJECT (standard_view), "current-directory");
}
@@ -1611,31 +1630,6 @@ thunar_standard_view_merge_custom_actions (ThunarStandardView *standard_view,
thunar_file_list_free (files);
}
- /* determine the currently selected file/folder for which to load custom actions */
- if (G_LIKELY (selected_items != NULL && selected_items->next == NULL))
- {
- gtk_tree_model_get_iter (GTK_TREE_MODEL (standard_view->model), &iter, selected_items->data);
- file = thunar_list_model_get_file (standard_view->model, &iter);
- }
- else if (selected_items == NULL)
- {
- file = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
- if (G_LIKELY (file != NULL))
- g_object_ref (G_OBJECT (file));
- }
- else
- {
- file = NULL;
- }
-
- /* load the custom actions for the currently selected file/folder */
- if (G_LIKELY (file != NULL))
- {
- tmp = thunar_file_get_actions (file, window);
- actions = g_list_concat (actions, tmp);
- g_object_unref (G_OBJECT (file));
- }
-
/* remove the previously determined menu actions from the UI manager */
if (G_LIKELY (standard_view->priv->custom_merge_id != 0))
{
@@ -1969,66 +1963,14 @@ thunar_standard_view_action_delete (GtkAction *action,
ThunarStandardView *standard_view)
{
ThunarApplication *application;
- GtkWidget *dialog;
- GtkWidget *window;
- GList *selected_paths;
- guint n_selected_files;
- gchar *message;
- gint response;
g_return_if_fail (GTK_IS_ACTION (action));
g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
- /* determine the number of currently selected files */
- n_selected_files = g_list_length (standard_view->selected_files);
- if (G_UNLIKELY (n_selected_files <= 0))
- return;
-
- /* generate the question to confirm the delete operation */
- if (G_LIKELY (n_selected_files == 1))
- {
- message = g_strdup_printf (_("Are you sure that you want to\npermanently delete \"%s\"?"),
- thunar_file_get_display_name (THUNAR_FILE (standard_view->selected_files->data)));
- }
- else
- {
- message = g_strdup_printf (ngettext ("Are you sure that you want to permanently\ndelete the selected file?",
- "Are you sure that you want to permanently\ndelete the %u selected files?",
- n_selected_files),
- n_selected_files);
- }
-
- /* determine the selected paths, just in case the selection changes in the meantime */
- selected_paths = thunar_file_list_to_path_list (standard_view->selected_files);
-
- /* ask the user to confirm the delete operation */
- window = gtk_widget_get_toplevel (GTK_WIDGET (standard_view));
- dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_MODAL
- | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_NONE,
- "%s", message);
- gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_DELETE, GTK_RESPONSE_YES,
- NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("If you delete a file, it is permanently lost."));
- response = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- g_free (message);
-
- /* perform the delete operation */
- if (G_LIKELY (response == GTK_RESPONSE_YES))
- {
- application = thunar_application_get ();
- thunar_application_unlink (application, window, selected_paths);
- g_object_unref (G_OBJECT (application));
- }
-
- /* release the path list */
- thunar_vfs_path_list_free (selected_paths);
+ /* delete the selected files */
+ application = thunar_application_get ();
+ thunar_application_unlink_files (application, GTK_WIDGET (standard_view), standard_view->selected_files);
+ g_object_unref (G_OBJECT (application));
}
@@ -2057,6 +1999,10 @@ thunar_standard_view_action_select_all_files (GtkAction *action,
g_return_if_fail (GTK_IS_ACTION (action));
g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ /* grab the focus to the view */
+ gtk_widget_grab_focus (GTK_WIDGET (standard_view));
+
+ /* select all files in the real view */
(*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->select_all) (standard_view);
}
@@ -2333,6 +2279,24 @@ thunar_standard_view_action_rename (GtkAction *action,
+static void
+thunar_standard_view_action_restore (GtkAction *action,
+ ThunarStandardView *standard_view)
+{
+ ThunarApplication *application;
+
+ g_return_if_fail (GTK_IS_ACTION (action));
+ g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+
+ /* restore the selected files */
+ application = thunar_application_get ();
+ thunar_application_restore_files (application, GTK_WIDGET (standard_view), standard_view->selected_files,
+ thunar_standard_view_new_files_closure (standard_view));
+ g_object_unref (G_OBJECT (application));
+}
+
+
+
static GClosure*
thunar_standard_view_new_files_closure (ThunarStandardView *standard_view)
{
@@ -3294,8 +3258,10 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view)
GtkTreeIter iter;
ThunarFile *current_directory;
gboolean can_paste_into_folder;
+ gboolean restorable;
gboolean pastable;
gboolean writable;
+ gboolean trashed;
GList *lp, *selected_files;
gint n_selected_files = 0;
@@ -3329,9 +3295,18 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view)
/* and setup the new selected files list */
standard_view->selected_files = selected_files;
- /* check whether the folder displayed by the view is writable */
+ /* enable "Restore" if we have only trashed files (atleast one file) */
+ for (lp = selected_files, restorable = (lp != NULL); lp != NULL; lp = lp->next)
+ if (!thunar_file_is_trashed (lp->data))
+ {
+ restorable = FALSE;
+ break;
+ }
+
+ /* check whether the folder displayed by the view is writable/in the trash */
current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
writable = (current_directory != NULL && thunar_file_is_writable (current_directory));
+ trashed = (current_directory != NULL && thunar_file_is_trashed (current_directory));
/* check whether the clipboard contains data that can be pasted here */
pastable = (standard_view->clipboard != NULL && thunar_clipboard_manager_get_can_paste (standard_view->clipboard));
@@ -3343,8 +3318,8 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view)
&& thunar_file_is_writable (selected_files->data);
/* update the "Create Folder"/"Create Document" actions */
- gtk_action_set_sensitive (standard_view->priv->action_create_folder, writable);
- gtk_action_set_sensitive (standard_view->priv->action_create_document, writable);
+ gtk_action_set_sensitive (standard_view->priv->action_create_folder, !trashed && writable);
+ gtk_action_set_sensitive (standard_view->priv->action_create_document, !trashed && writable);
/* update the "Properties" action */
gtk_action_set_sensitive (standard_view->priv->action_properties, (n_selected_files == 1 || (n_selected_files == 0 && current_directory != NULL)));
@@ -3371,8 +3346,8 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view)
/* update the "Delete" action */
g_object_set (G_OBJECT (standard_view->priv->action_delete),
"sensitive", (n_selected_files > 0) && writable,
- "tooltip", ngettext ("Delete the selected file permanently",
- "Delete the selected files permanently",
+ "tooltip", ngettext ("Delete the selected file",
+ "Delete the selected files",
n_selected_files),
NULL);
@@ -3384,7 +3359,7 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view)
/* update the "Duplicate File(s)" action */
g_object_set (G_OBJECT (standard_view->priv->action_duplicate),
- "sensitive", (n_selected_files > 0) && writable,
+ "sensitive", (n_selected_files > 0) && !restorable && writable,
"tooltip", ngettext ("Duplicate the selected file",
"Duplicate each selected file",
n_selected_files),
@@ -3393,16 +3368,27 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view)
/* update the "Make Link(s)" action */
g_object_set (G_OBJECT (standard_view->priv->action_make_link),
"label", ngettext ("Ma_ke Link", "Ma_ke Links", n_selected_files),
- "sensitive", (n_selected_files > 0) && writable,
+ "sensitive", (n_selected_files > 0) && !restorable && writable,
"tooltip", ngettext ("Create a symbolic link for the selected file",
"Create a symbolic link for each selected file",
n_selected_files),
NULL);
/* update the "Rename" action */
- gtk_action_set_sensitive (standard_view->priv->action_rename,
- (n_selected_files > 0 && current_directory != NULL
- && thunar_file_is_writable (current_directory)));
+ g_object_set (G_OBJECT (standard_view->priv->action_rename),
+ "sensitive", (n_selected_files > 0 && !restorable && writable),
+ "tooltip", ngettext ("Rename the selected file",
+ "Rename the selected files",
+ n_selected_files),
+ NULL);
+
+ /* update the "Restore" action */
+ g_object_set (G_OBJECT (standard_view->priv->action_restore),
+ "sensitive", (n_selected_files > 0 && restorable),
+ "tooltip", ngettext ("Restore the selected file",
+ "Restore the selected files",
+ n_selected_files),
+ NULL);
/* update the statusbar text */
thunar_standard_view_update_statusbar_text (standard_view);
diff --git a/thunar/thunar-thumbnail-generator.c b/thunar/thunar-thumbnail-generator.c
index 2ee8695f1e2760f3e6b3501c5f826f557eaf024c..2be008e2e1b396a968913ef4a911accf6831a3a9 100644
--- a/thunar/thunar-thumbnail-generator.c
+++ b/thunar/thunar-thumbnail-generator.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
*
* 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
@@ -21,6 +21,7 @@
#include <config.h>
#endif
+#include <thunar/thunar-private.h>
#include <thunar/thunar-thumbnail-generator.h>
@@ -277,7 +278,7 @@ thunar_thumbnail_info_free (ThunarThumbnailInfo *info)
{
g_object_unref (G_OBJECT (info->file));
thunar_vfs_info_unref (info->info);
- g_free (info);
+ _thunar_slice_free (ThunarThumbnailInfo, info);
}
@@ -339,7 +340,7 @@ thunar_thumbnail_generator_enqueue (ThunarThumbnailGenerator *generator,
if (G_LIKELY (lp == NULL))
{
/* allocate a thumbnail info for the file */
- info = g_new (ThunarThumbnailInfo, 1);
+ info = _thunar_slice_new (ThunarThumbnailInfo);
info->file = g_object_ref (G_OBJECT (file));
info->info = thunar_vfs_info_copy (thunar_file_get_info (file));
diff --git a/thunar/thunar-tree-model.c b/thunar/thunar-tree-model.c
index 0636c453357cfcb0c0ac51bff5d425b8d6fb9684..2bfd4e56917dc39b952d112dd1956b1284cf050c 100644
--- a/thunar/thunar-tree-model.c
+++ b/thunar/thunar-tree-model.c
@@ -32,6 +32,7 @@
#include <thunar/thunar-folder.h>
#include <thunar/thunar-pango-extensions.h>
#include <thunar/thunar-preferences.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-tree-model.h>
@@ -286,10 +287,11 @@ static void
thunar_tree_model_init (ThunarTreeModel *model)
{
ThunarTreeModelItem *item;
- ThunarVfsPath *path;
+ ThunarVfsPath *system_path_list[3] = { thunar_vfs_path_get_for_home (), thunar_vfs_path_get_for_trash (), thunar_vfs_path_get_for_root () };
ThunarFile *file;
GList *volumes;
GNode *node;
+ guint n;
/* initialize the model data */
model->sort_case_sensitive = TRUE;
@@ -308,35 +310,25 @@ thunar_tree_model_init (ThunarTreeModel *model)
g_signal_connect (G_OBJECT (model->volume_manager), "volumes-removed", G_CALLBACK (thunar_tree_model_volumes_removed), model);
g_signal_connect (G_OBJECT (model->volume_manager), "volume-pre-unmount", G_CALLBACK (thunar_tree_model_volume_pre_unmount), model);
- /* allocate the home node */
- path = thunar_vfs_path_get_for_home ();
- file = thunar_file_get_for_path (path, NULL);
- if (G_LIKELY (file != NULL))
+ /* append the system defined nodes ('Home', 'Trash', 'File System') */
+ for (n = 0; n < G_N_ELEMENTS (system_path_list); ++n)
{
- /* add the home node */
- item = thunar_tree_model_item_new_with_file (model, file);
- node = g_node_append_data (model->root, item);
- g_object_unref (G_OBJECT (file));
-
- /* add the dummy node */
- g_node_append_data (node, NULL);
- }
- thunar_vfs_path_unref (path);
+ /* determine the file for the path */
+ file = thunar_file_get_for_path (system_path_list[n], NULL);
+ if (G_LIKELY (file != NULL))
+ {
+ /* create and append the new node */
+ item = thunar_tree_model_item_new_with_file (model, file);
+ node = g_node_append_data (model->root, item);
+ g_object_unref (G_OBJECT (file));
- /* allocate the root node */
- path = thunar_vfs_path_get_for_root ();
- file = thunar_file_get_for_path (path, NULL);
- if (G_LIKELY (file != NULL))
- {
- /* add the root node */
- item = thunar_tree_model_item_new_with_file (model, file);
- node = g_node_append_data (model->root, item);
- g_object_unref (G_OBJECT (file));
+ /* add the dummy node */
+ g_node_append_data (node, NULL);
+ }
- /* add the dummy node */
- g_node_append_data (node, NULL);
+ /* release the system defined path */
+ thunar_vfs_path_unref (system_path_list[n]);
}
- thunar_vfs_path_unref (path);
/* setup the initial volumes */
volumes = thunar_vfs_volume_manager_get_volumes (model->volume_manager);
@@ -1171,7 +1163,7 @@ thunar_tree_model_item_new_with_file (ThunarTreeModel *model,
{
ThunarTreeModelItem *item;
- item = g_new0 (ThunarTreeModelItem, 1);
+ item = _thunar_slice_new0 (ThunarTreeModelItem);
item->file = g_object_ref (G_OBJECT (file));
item->model = model;
@@ -1187,7 +1179,7 @@ thunar_tree_model_item_new_with_volume (ThunarTreeModel *model,
ThunarTreeModelItem *item;
ThunarVfsPath *path;
- item = g_new0 (ThunarTreeModelItem, 1);
+ item = _thunar_slice_new0 (ThunarTreeModelItem);
item->volume = g_object_ref (G_OBJECT (volume));
item->model = model;
@@ -1218,7 +1210,7 @@ thunar_tree_model_item_free (ThunarTreeModelItem *item)
thunar_tree_model_item_reset (item);
/* release the item */
- g_free (item);
+ _thunar_slice_free (ThunarTreeModelItem, item);
}
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index 39892222ebda88faf95ba6d7c3747b2382ce15a2..8a169a4efa9b293c8881330cbf59107f0ee38cfa 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -135,6 +135,7 @@ static void thunar_tree_view_action_create_folder (ThunarTreeV
static void thunar_tree_view_action_cut (ThunarTreeView *view);
static void thunar_tree_view_action_delete (ThunarTreeView *view);
static void thunar_tree_view_action_eject (ThunarTreeView *view);
+static void thunar_tree_view_action_empty_trash (ThunarTreeView *view);
static gboolean thunar_tree_view_action_mount (ThunarTreeView *view);
static void thunar_tree_view_action_open (ThunarTreeView *view);
static void thunar_tree_view_action_open_in_new_window (ThunarTreeView *view);
@@ -1068,18 +1069,36 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
}
+ else if (G_UNLIKELY (file != NULL && thunar_file_is_trashed (file) && thunar_file_is_root (file)))
+ {
+ /* append the "Empty Trash" menu action */
+ item = gtk_image_menu_item_new_with_mnemonic (_("_Empty Trash"));
+ gtk_widget_set_sensitive (item, (thunar_file_get_size (file) > 0));
+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_empty_trash), view);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
- /* append the "Create Folder" menu action */
- item = gtk_image_menu_item_new_with_mnemonic (_("Create _Folder..."));
- g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_create_folder), view);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_set_sensitive (item, (file != NULL && thunar_file_is_writable (file)));
- gtk_widget_show (item);
+ /* append a menu separator */
+ item = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
+ }
- /* append a separator item */
- item = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
+ /* check if we have a non-trashed resource */
+ if (G_LIKELY (file != NULL && !thunar_file_is_trashed (file)))
+ {
+ /* append the "Create Folder" menu action */
+ item = gtk_image_menu_item_new_with_mnemonic (_("Create _Folder..."));
+ gtk_widget_set_sensitive (item, thunar_file_is_writable (file));
+ g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_create_folder), view);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
+
+ /* append a separator item */
+ item = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
+ }
if (G_LIKELY (file != NULL))
{
@@ -1488,51 +1507,27 @@ thunar_tree_view_action_delete (ThunarTreeView *view)
{
ThunarApplication *application;
ThunarFile *file;
- GtkWidget *dialog;
- GtkWidget *window;
- GList paths;
- gint response;
+ GList file_list;
g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* determine the selected file */
file = thunar_tree_view_get_selected_file (view);
- if (G_UNLIKELY (file == NULL))
- return;
-
- /* ask the user to confirm the delete operation */
- window = gtk_widget_get_toplevel (GTK_WIDGET (view));
- dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_MODAL
- | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_NONE,
- _("Are you sure that you want to\npermanently delete \"%s\"?"),
- thunar_file_get_display_name (file));
- gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_DELETE, GTK_RESPONSE_YES,
- NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("If you delete a file, it is permanently lost."));
- response = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-
- /* perform the delete operation */
- if (G_LIKELY (response == GTK_RESPONSE_YES))
+ if (G_LIKELY (file != NULL))
{
- /* fake a path list with only the folders path */
- paths.data = thunar_file_get_path (file);
- paths.next = paths.prev = NULL;
+ /* fake a file list */
+ file_list.data = file;
+ file_list.next = NULL;
+ file_list.prev = NULL;
- /* really delete the folder */
+ /* delete the file */
application = thunar_application_get ();
- thunar_application_unlink (application, window, &paths);
+ thunar_application_unlink_files (application, GTK_WIDGET (view), &file_list);
g_object_unref (G_OBJECT (application));
- }
- /* release the file reference */
- g_object_unref (G_OBJECT (file));
+ /* release the file */
+ g_object_unref (G_OBJECT (file));
+ }
}
@@ -1568,6 +1563,21 @@ thunar_tree_view_action_eject (ThunarTreeView *view)
+static void
+thunar_tree_view_action_empty_trash (ThunarTreeView *view)
+{
+ ThunarApplication *application;
+
+ g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+
+ /* empty the trash bin (asking the user first) */
+ application = thunar_application_get ();
+ thunar_application_empty_trash (application, GTK_WIDGET (view));
+ g_object_unref (G_OBJECT (application));
+}
+
+
+
static gboolean
thunar_tree_view_action_mount (ThunarTreeView *view)
{
diff --git a/thunar/thunar-util.c b/thunar/thunar-util.c
new file mode 100644
index 0000000000000000000000000000000000000000..ce7002d5f72cc8ff6a090c29489cf61cf5133744
--- /dev/null
+++ b/thunar/thunar-util.c
@@ -0,0 +1,174 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * 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, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar/thunar-util.h>
+
+
+
+/**
+ * thunar_util_looks_like_an_uri:
+ * @string : an input string.
+ *
+ * Returns %TRUE if the @string looks like an URI
+ * according to RFC 2396, %FALSE otherwise.
+ *
+ * Return value: %TRUE if @string looks like an URI.
+ **/
+gboolean
+thunar_util_looks_like_an_uri (const gchar *string)
+{
+ g_return_val_if_fail (string != NULL, FALSE);
+
+ /* <scheme> starts with an alpha character */
+ if (g_ascii_isalpha (*string))
+ {
+ /* <scheme> continues with (alpha | digit | "+" | "-" | ".")* */
+ for (++string; g_ascii_isalnum (*string) || *string == '+' || *string == '-' || *string == '.'; ++string)
+ ;
+
+ /* <scheme> must be followed by ":" */
+ return (*string == ':');
+ }
+
+ return FALSE;
+}
+
+
+
+/**
+ * thunar_util_humanize_file_time:
+ * @file_time : a #ThunarVfsFileTime.
+ *
+ * Returns a human readable date representation of the specified
+ * @file_time. The caller is responsible to free the returned
+ * string using g_free() when no longer needed.
+ *
+ * Return value: a human readable date representation of @file_time.
+ **/
+gchar*
+thunar_util_humanize_file_time (ThunarVfsFileTime file_time)
+{
+ const gchar *date_format;
+ gchar *date_string;
+ GDate dfile;
+ GDate dnow;
+ gint diff;
+
+ /* check if the file_time is invalid */
+ if (G_LIKELY (file_time != 0))
+ {
+ /* setup the GDate's */
+ g_date_set_time_t (&dfile, file_time);
+ g_date_set_time_t (&dnow, time (NULL));
+
+ /* determine the difference in days */
+ diff = g_date_get_julian (&dnow) - g_date_get_julian (&dfile);
+ if (diff == 0)
+ {
+ /* TRANSLATORS: file was modified less than one day ago */
+ return g_strdup (_("Today"));
+ }
+ else if (diff == 1)
+ {
+ /* TRANSLATORS: file was modified less than two days ago */
+ return g_strdup (_("Yesterday"));
+ }
+ else
+ {
+ if (diff > 1 && diff < 7)
+ date_format = "%A"; /* Days from last week */
+ else
+ date_format = "%x"; /* Any other date */
+
+ /* format the date string accordingly */
+ date_string = g_new (gchar, 16);
+ if (g_date_strftime (date_string, 16, date_format, &dfile) != 0)
+ return date_string;
+ g_free (date_string);
+ }
+ }
+
+ /* the file_time is invalid */
+ return g_strdup (_("Unknown"));
+}
+
+
+
+/**
+ * thunar_util_parse_parent:
+ * @parent : a #GtkWidget, a #GdkScreen or %NULL.
+ * @window_return : return location for the toplevel #GtkWindow or
+ * %NULL.
+ *
+ * Determines the screen for the @parent and returns that #GdkScreen.
+ * If @window_return is not %NULL, the pointer to the #GtkWindow is
+ * placed into it, or %NULL if the window could not be determined.
+ *
+ * Return value: the #GdkScreen for the @parent.
+ **/
+GdkScreen*
+thunar_util_parse_parent (gpointer parent,
+ GtkWindow **window_return)
+{
+ GdkScreen *screen;
+ GtkWidget *window = NULL;
+
+ g_return_val_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent), NULL);
+
+ /* determine the proper parent */
+ if (parent == NULL)
+ {
+ /* just use the default screen then */
+ screen = gdk_screen_get_default ();
+ }
+ else if (GDK_IS_SCREEN (parent))
+ {
+ /* yep, that's a screen */
+ screen = GDK_SCREEN (parent);
+ }
+ else
+ {
+ /* parent is a widget, so let's determine the toplevel window */
+ window = gtk_widget_get_toplevel (GTK_WIDGET (parent));
+ if (GTK_WIDGET_TOPLEVEL (window))
+ {
+ /* make sure the toplevel window is shown */
+ gtk_widget_show_now (window);
+ }
+ else
+ {
+ /* no toplevel, not usable then */
+ window = NULL;
+ }
+
+ /* determine the screen for the widget */
+ screen = gtk_widget_get_screen (GTK_WIDGET (parent));
+ }
+
+ /* check if we should return the window */
+ if (G_LIKELY (window_return != NULL))
+ *window_return = (GtkWindow *) window;
+
+ return screen;
+}
+
diff --git a/thunar/thunar-util.h b/thunar/thunar-util.h
new file mode 100644
index 0000000000000000000000000000000000000000..a2e81153289e74dffd151f099a9754b4db3c4dbe
--- /dev/null
+++ b/thunar/thunar-util.h
@@ -0,0 +1,36 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * 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, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __THUNAR_UTIL_H__
+#define __THUNAR_UTIL_H__
+
+#include <thunar-vfs/thunar-vfs.h>
+
+G_BEGIN_DECLS;
+
+gboolean thunar_util_looks_like_an_uri (const gchar *string) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+gchar *thunar_util_humanize_file_time (ThunarVfsFileTime file_time) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+
+GdkScreen *thunar_util_parse_parent (gpointer parent,
+ GtkWindow **window_return) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_UTIL_H__ */