diff -Nru spacefm-1.0.4/ChangeLog spacefm-1.0.5/ChangeLog --- spacefm-1.0.4/ChangeLog 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/ChangeLog 2016-01-20 13:22:23.000000000 +0000 @@ -1,3 +1,24 @@ +1.0.5 2016-01-20: + recreate too small cached thumbnails #584 + read $XDG_TEMPLATES_DIR via glib for user-dirs.dirs support #581 + Devices|Settings|Auto-Mount|Mount Dirs accept XDG vars, mkdir #558 + fix Paste in dir tree pastes to wrong dir #596 + menu key in dir tree changes dir and acts on correct dir #596 + [desktop] show video thumbnails on desktop + Prefs add 384x384 icon size option + obey StartupNotify when opening with desktop app + configure.ac set G_LOG_DOMAIN + fix main.c debug_gdk_threads_leave + change detection blacklist detect new files #478 #582 + get mime type of only reg and link files, not char dev + fix segfault in ptk_bookmark_view_reload_list to vfs_load_icon + prevent filesystem find loop hang in new file/folder dialog #601 + fix crash on GTK icon theme reload; fix liststore memory leaks #566 + udevil iso unmount device handler new whitelist/blacklist #606 + fix broken key shortcuts in Open|In Panel menu #610 + add lxqt-sudo and lxsu to list of su frontends #617 + add support for qterminal in list of terminals + make Paste As Target paste canonicalized final target when possible 1.0.4 2015-10-17: new spacefm-installer replaces self-extrct and install #571 README rewritten and manual updated for new installer #571 diff -Nru spacefm-1.0.4/configure spacefm-1.0.5/configure --- spacefm-1.0.4/configure 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/configure 2016-01-20 13:22:23.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for spacefm 1.0.4. +# Generated by GNU Autoconf 2.69 for spacefm 1.0.5. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='spacefm' PACKAGE_TARNAME='spacefm' -PACKAGE_VERSION='1.0.4' -PACKAGE_STRING='spacefm 1.0.4' +PACKAGE_VERSION='1.0.5' +PACKAGE_STRING='spacefm 1.0.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1410,7 +1410,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures spacefm 1.0.4 to adapt to many kinds of systems. +\`configure' configures spacefm 1.0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1480,7 +1480,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of spacefm 1.0.4:";; + short | recursive ) echo "Configuration of spacefm 1.0.5:";; esac cat <<\_ACEOF @@ -1636,7 +1636,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -spacefm configure 1.0.4 +spacefm configure 1.0.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2001,7 +2001,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by spacefm $as_me 1.0.4, which was +It was created by spacefm $as_me 1.0.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2868,7 +2868,7 @@ # Define the identity of the package. PACKAGE='spacefm' - VERSION='1.0.4' + VERSION='1.0.5' cat >>confdefs.h <<_ACEOF @@ -14126,6 +14126,8 @@ $as_echo "#define G_DISABLE_ASSERT 1" >>confdefs.h +$as_echo "#define G_LOG_DOMAIN \"SpaceFM\"" >>confdefs.h + # Check whether --with-bash-path was given. @@ -16929,7 +16931,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by spacefm $as_me 1.0.4, which was +This file was extended by spacefm $as_me 1.0.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16986,7 +16988,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -spacefm config.status 1.0.4 +spacefm config.status 1.0.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru spacefm-1.0.4/configure.ac spacefm-1.0.5/configure.ac --- spacefm-1.0.4/configure.ac 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/configure.ac 2016-01-20 13:22:23.000000000 +0000 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([spacefm], [1.0.4]) +AC_INIT([spacefm], [1.0.5]) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([dist-bzip2] [subdir-objects]) AM_MAINTAINER_MODE @@ -29,6 +29,7 @@ AC_CHECK_LIB(X11, XClearWindow) AC_DEFINE(G_DISABLE_ASSERT, [1], [do not enable g_asserts]) +AC_DEFINE(G_LOG_DOMAIN, "SpaceFM") AC_ARG_WITH([bash-path], AC_HELP_STRING([--with-bash-path=PATH], [Absolute path to GENUINE bash v4 - other shells lack features REQUIRED by SpaceFM (default: /bin/bash)]), diff -Nru spacefm-1.0.4/data/spacefm-manual-en.html spacefm-1.0.5/data/spacefm-manual-en.html --- spacefm-1.0.4/data/spacefm-manual-en.html 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/data/spacefm-manual-en.html 2016-01-20 13:22:23.000000000 +0000 @@ -394,7 +394,8 @@ Also, if you want to use startup notification: libstartup-notification0-dev - ALSO RECOMMENDED: eject lsof wget udevil|pmount|udisks gksu|kdesu|ktsuss + RECOMMENDED: udevil|pmount|udisks gksu|kdesu|ktsuss|lxqt-sudo eject lsof + wget For additional mounting support: fuseiso curlftpfs jmtpfs gphotofs ifuse @@ -921,7 +922,6 @@ How do I change the file list view, add/remove columns, etc.?
How do I hide a menu item?
How do I customise the toolbars?
- I hid the toolbar - how do I restore it?
How do I create a custom menu item?
Use Design Mode to add a New custom menu item.
How do I move a custom menu item to another menu or menu position?
@@ -1427,11 +1427,11 @@

Importing GTK Bookmarks
-

Some Gnome applications store bookmarks in GTK's bookmarks file (~/.gtk-bookmarks). This is a plain text file which can be edited manually. While SpaceFM is not a Gnome application and does not store its bookmarks in this file (the format of the file cannot store SpaceFM's specialized bookmarks and submenus), SpaceFM can import the contents of this file. To do so, right-click on an item in the Booksmarks side pane and select New|Import|GTK Bookmarks. All bookmarks will be imported into the current submenu (or, if you right-clicked on a submenu, then into the selected submenu). +

Some GNOME applications store bookmarks in GTK's bookmarks file (~/.config/gtk-3.0/bookmarks or the older ~/.gtk-bookmarks). This is a plain text file which can be edited manually. While SpaceFM is not a GNOME application and does not store its bookmarks in this file (the format of the file cannot store SpaceFM's specialized bookmarks and submenus), SpaceFM can import the contents of this file. To do so, right-click on an item in the Booksmarks side pane and select New|Import|GTK Bookmarks. All bookmarks will be imported into the current submenu (or, if you right-clicked on a submenu, then into the selected submenu).

IMPORTANT: Note that importing hundreds of bookmarks into SpaceFM is not recommended. Due to their integration with the menu system, this may cause performance lags in the GUI. If you have many GTK bookmarks, you may wish to edit the file before importing it, or import them into a submenu and keep only those you need. -

In addition to importing GTK's bookmarks, these bookmarks are also shown in the GTK file and folder chooser dialogs used in SpaceFM. You will see the GTK bookmarks listed in the upper-left 'Places' pane of these dialogs, and you can use the plus (+) and minus (-) buttons there to add or remove bookmarks from that list (which will update ~/.gtk-bookmarks). Changing bookmarks in this 'Places' list has no effect on SpaceFM's Bookmarks menu. +

In addition to importing GTK's bookmarks, these bookmarks are also shown in the GTK file and folder chooser dialogs used in SpaceFM. You will see the GTK bookmarks listed in the upper-left 'Places' pane of these dialogs, and you can use the plus (+) and minus (-) buttons there to add or remove bookmarks from that list (which will update the ~/.config/gtk-3.0/bookmarks file). Changing bookmarks in this 'Places' list has no effect on SpaceFM's Bookmarks menu. @@ -2042,9 +2042,11 @@

Auto Mount|Mount Dirs
-This dialog allows you to enter a single directory where SpaceFM should automatically create mount point directories for fuse and similar filesystems (%a in handler commands). This directory must exist and be user-writable (do NOT use /media). For best results with all handlers, avoid spaces and other special characters. If left blank, ~/.cache/spacefm/ (or $XDG_CACHE_HOME/spacefm/) is used. +This dialog allows you to enter a single directory where SpaceFM should automatically create mount point directories for fuse and similar filesystems (%a in handler commands). This directory must be user-writable (do NOT use /media); if it doesn't already exist, it will be created (including parents). For best results with all handlers, avoid spaces and other special characters. If left blank, ~/.cache/spacefm/ (or $XDG_CACHE_HOME/spacefm/) is used. -

Note that some handlers or mount programs may not obey this setting. It will only be used by handlers which use %a in their mount or open commands. +

The following variables are recognized and will be replaced with their current value: $USER $UID $HOME $XDG_RUNTIME_DIR $XDG_CACHE_HOME + +

Note that some handlers or mount programs may not obey this setting. It will only be used by handlers which use %a in their mount or open commands.

Anytime a device, protocol or file handler uses %a to automatically create a mount point, the specified directory will be used as the parent. This applies to both manual and automatic mounts. @@ -2177,13 +2179,15 @@

Change Detection
-Change Detection opens a dialog which allows you to enter a comma- or space-separated list of filesystems which should NOT be monitored for changes. This setting only affects non-block devices (such as nfs or fuse), and is usually used to prevent SpaceFM becoming unresponsive with network filesystems. +Change Detection opens a dialog which allows you to enter a comma- or space-separated list of filesystems which should NOT be monitored for changes to files. This setting only affects non-block devices (such as nfs or fuse), and is usually used to prevent SpaceFM becoming unresponsive with network filesystems. + +

When SpaceFM opens a directory in a tab, normally it will detect changes, for example if you edit or change the properties or sizes of files in the directory. Because SpaceFM works directly with the kernel for file information, and because some network filesystems become temporarily unresponsive when busy, this can cause SpaceFM to become temporarily unresponsive to mouse clicks, etc. -

When SpaceFM opens a directory in a tab, normally it will detect changes, for example if you change, add, or delete files in the directory. Because SpaceFM works directly with the kernel for file information, and because some network filesystems become temporarily unresponsive when busy, this can cause SpaceFM to become temporarily unresponsive to mouse clicks, etc. +

To prevent this, the device's filesystem can be listed in the Change Detection Blacklist. In this case, SpaceFM will not detect changes to files, load thumbnails, or load subdirectory sizes, and you will need to manually refresh the file list view to see file changes. To do so, right-click on the file list and select View|Refresh, or press F5. -

To prevent this, the device's filesystem can be listed in the Change Detection Blacklist. In this case, SpaceFM will not detect file changes, and you will need to manually refresh the file list view to see them. To do so, right-click on the file list and select View|Refresh, or press F5. +

Note that even if the filesystem is listed in Change Detection, new files created in the directory, or files which are renamed or deleted, will be detected and read. -

An alternative approach to blacklisting filesystems is to close the tab containing the filesystem while a copy is in progress to that directory, for example. +

An alternative approach to blacklisting filesystems is to close the tab containing the filesystem while a copy is in progress to that directory.

Single Click
@@ -2328,7 +2332,7 @@

Each SpaceFM window includes a single Task Manager which centrally manages the tasks of all panels in the window. The Task Manager is designed to eliminate annoying popup dialogs which interfere with user multi-tasking, and allows you to continue working while large files are being copied, etc. The Task Manager lists running tasks, automatically manages the task queue, allows you to stop, pause, queue, or resume tasks manually, and opens popup dialogs. Like most parts of SpaceFM, the Task Manager can also be customised with your own commands to control or interact with running tasks. -

A task is a job initiated by the user, such as copying a file. Tasks come in two varieties: internal and exec. SpaceFM's internal functions handle tasks such as a copying, moving, and deleting files, while an exec task runs an executable or script, either initiated from within SpaceFM's functions or from a custom command. The output of exec tasks is also collected and shown in the popup dialog's output monitor. exec tasks include custom commands as well as external commands run by SpaceFM, such as running udevil to unmount a device. +

A task is a job initiated by the user, such as copying a file. Tasks come in two varieties: internal and exec. Internal tasks handle built-in functions such as a copying, moving, and deleting files, while an exec task runs an executable or script, either initiated from within SpaceFM's built-in functions (such as running udevil to unmount a device) or from a custom command. The output of exec tasks is also collected and shown in the popup dialog's output monitor.

The Task Manager is located at the bottom of the SpaceFM window, below all panels. It has two display modes: Show and Auto-Hide. If option View|Task Manager|Show Manager is selected, the Task Manager is always visible, even when no tasks are running. Or, if option View|Task Manager|Auto-Hide Manager is selected (the default), the Task Manager will become visible when tasks are running, and will be automatically hidden from view when the last task completes. The size of the Task Manager may be adjusted by dragging the pane separator above it. @@ -2606,11 +2610,11 @@

Errors
The Errors submenu contains a set of radio options which control how errors in internal tasks (such as copy and move) are handled by default. (These options have no effect on exec tasks such as custom commands.) -

If option Stop If First is selected (the default), the task will be stopped by the Task Manager if an error occurs AND that error is encountered before the task has successfully processed one file. If an error occurs on later files in the task, the Task Manager will open a popup dialog to show the error, but subsequent actions in the task will continue to run. For example, if there are more files to be copied, SpaceFM will attempt to copy them despite any errors on previous files. +

If option Stop If Error First is selected (the default), the task will be stopped by the Task Manager if an error occurs AND that error is encountered before the task has successfully processed one file. If an error occurs on later files in the task, the Task Manager will open a popup dialog to show the error, but subsequent actions in the task will continue to run. For example, if there are more files to be copied, SpaceFM will attempt to copy them despite any errors on previous files. -

Stop If First is provided as a convenience option. Usually if the first action of a task fails, the rest of the task will fail as well, so it might as well be stopped rather than producing a long list of errors for every file in the task. +

Stop If Error First is provided as a convenience option. Usually if the first action of a task fails, the rest of the task will fail as well, so it might as well be stopped rather than producing a long list of errors for every file in the task. -

If option Stop On Any is instead selected, the Task Manager will stop if any error is encountered in the task, regardless of whether the error occurs on the first or later actions. +

If option Stop On Any Error is instead selected, the Task Manager will stop if any error is encountered in the task, regardless of whether the error occurs on the first or later actions.

If option Continue is selected, the Task Manager will never stop an internal task due to errors. It will present the popup dialog on each error, and will list the errors in the output monitor, but subsequent actions in the task will continue. For example, if a set of files is being copied, and only one file in the middle produces a copy error, all the other files will still be copied. The popup dialog will show the error(s) for the file(s) which failed. @@ -2663,7 +2667,7 @@

Custom Menus
-As with most menus, it is also possible to add your own custom menu items and submenus to the Task Manager's context menu. This allows you to add commands which can control or interact with running tasks. +As with most menus, it is also possible to add your own custom menu items and submenus to the Task Manager's context menu using Design Mode. This allows you to add commands which can control or interact with running tasks.

There are several provided bash variables which your commands can use to get information about the currently selected task: 

@@ -5286,7 +5290,7 @@
 
 --input also accepts a file instead of a string.  For example:
 
    echo "Some default text" > /tmp/dialog-input
-    spacefm -g --input @/tmp/dialog-input

+    spacefm -g --input @/tmp/dialog-input --button ok
The input's default text will be read from the first line of the file. The file is also watched for changes, allowing you to later change the input's contents. As the dialog is running, in another terminal run: 
    echo "Some other text" > /tmp/dialog-input
@@ -5361,7 +5365,8 @@ while (( 1 )); do date > /tmp/dialog-pipe; sleep 1; done When the dialog is closed, the contents of the viewer are lost unless a SAVEFILE is also specified: -
    spacefm -g --viewer /tmp/dialog-pipe /tmp/dialog-pipe-contents
+
    spacefm -g --viewer /tmp/dialog-pipe /tmp/dialog-pipe-contents \
+	       --button ok

In commands, the value of a viewer (eg %viewer1) is the path of the file being viewed. To change the file being viewed, use set (eg 'set viewer1 /etc/mtab'). Also note that the contents of the viewer are also saved to SAVEFILE whenever the internal command source is run. @@ -5384,11 +5389,12 @@ 

    spacefm -g --editor /etc/fstab
When the dialog is closed, the contents of the editor are lost unless a SAVEFILE is also specified: -
    spacefm -g --editor /etc/fstab /tmp/fstab-edited
+
    spacefm -g --editor /etc/fstab /tmp/fstab-edited \
+	       --button ok
-When the above dialog is closed, the contents of the editor will be automatically saved to /tmp/fstab-edited. Your script can then use this file to replace the original if the user pressed the appropriate button, etc. +When the above dialog is closed via the OK button, the contents of the editor will be automatically saved to /tmp/fstab-edited. Your script can then use this file to replace the original if the user pressed the appropriate button, etc. -

Note: It is possible to set FILE and SAVEFILE to the same path, in which case the original file will automatically be overwritten when the dialog is closed, regardless of what button is pressed! +

Note: It is possible to set FILE and SAVEFILE to the same path, in which case the original file will automatically be overwritten when the dialog is closed with any button except Cancel.

In commands, the value of an editor (eg %editor1) is the path of the file last loaded. To load a file into the editor, use set (eg 'set editor1 /etc/mtab'). Also note that the contents of the editor are also saved to SAVEFILE whenever the internal command source is run. @@ -5416,13 +5422,14 @@ --check also accepts a file instead of a string for the VALUE (but not for the LABEL). For example: 

    echo 1 > /tmp/dialog-check
-    spacefm -g --check "Option One" @/tmp/dialog-check
+ spacefm -g --check "Option One" @/tmp/dialog-check \ + --button ok The checkbox's default value will be read from the first line of the file. The file is also watched for changes, allowing you to later change the state of the checkbox. As the dialog is running, in another terminal run: 
    echo 0 > /tmp/dialog-check
and the checkbox state will change to reflect the value in the file. -

Also, when the dialog is closed, the state of the checkbox will be saved to the file. This method can be used to have the dialog remember the state. The next time the dialog is run, assuming the file hasn't been deleted, the checkbox will have the same state as when the previous dialog was closed. +

Also, when the dialog is closed with any button except Cancel, the state of the checkbox will be saved to the file. This method can be used to have the dialog remember the state. The next time the dialog is run, assuming the file hasn't been deleted, the checkbox will have the same state as when the previous dialog was closed.

If a command is included, the COMMAND(s) will be run whenever the checkbox changes state, either due to the user clicking it, its @FILE value changing, or its value being set with an internal command. (The command is NOT run when the state is set to a default VALUE during dialog creation.) @@ -5467,7 +5474,8 @@ 

     spacefm -g --radio "Apples"  @/tmp/dialog-radio1 \
 	       --radio "Oranges" @/tmp/dialog-radio2 \
-	       --radio "Pears"	 @/tmp/dialog-radio3
+ --radio "Pears" @/tmp/dialog-radio3 \ + --button ok The files do not need to be created (they will be created automatically), unless you want to select an option other than the first. If you run the above command multiple times, you will note that your selection is remembered from the previously closed dialog. @@ -5656,9 +5664,10 @@

The default value, as an item value or a +N index, may also be read from the contents of a file: 

     echo "Item Two" > /tmp/dialog-dropdef
-    spacefm -g --drop @/tmp/dialog-drop @/tmp/dialog-dropdef
+ spacefm -g --drop @/tmp/dialog-drop @/tmp/dialog-dropdef \ + --button ok -The file /tmp/dialog-dropdef in the above example will NOT be watched - changing its contents while the dialog is running will have no effect. However, when the dialog closes, the currently selected item in the list will be written to the file. This will cause the dialog to remember the selected value between sessions. If you run the above spacefm command multiple times, you will note that your selection is remembered from the previously closed dialog. +The file /tmp/dialog-dropdef in the above example will NOT be watched - changing its contents while the dialog is running will have no effect. However, when the dialog is closed with any button except Cancel, the currently selected item in the list will be written to the file. This will cause the dialog to remember the selected value between sessions. If you run the above spacefm command multiple times, you will note that your selection is remembered from the previously closed dialog.

If a command is included, the COMMAND(s) will be run whenever the list selection changes. (The command is NOT run when the default item is set during dialog creation.) To include a COMMAND, be sure to include a DEFAULT value on the command line, or "" for no default. @@ -5843,10 +5852,11 @@

The default file or directory can also be read from a file. For example: 

     echo "/etc/fstab" > /tmp/dialog-chooser
-    spacefm -g --chooser @/tmp/dialog-chooser
+ spacefm -g --chooser @/tmp/dialog-chooser \ + --button ok -In the above example, the file '/tmp/dialog-chooser' will be watched. When its contents change, the chooser will change directory and/or select a file to reflect the new value on the first line of the file. When the dialog closes, the current directory of the chooser will be written to the file. Thus the next time the dialog opens, it will open to the same directory. +In the above example, the file '/tmp/dialog-chooser' will be watched. When its contents change, the chooser will change directory and/or select a file to reflect the new value on the first line of the file. When the dialog is closed with any button except Cancel, the current directory of the chooser will be written to the file. Thus the next time the dialog opens, it will open to the same directory.

To allow the user to select multiple files, add the --multi option (all options must precede any arguments): 

     spacefm -g --chooser --multi /etc
@@ -5963,7 +5973,8 @@ IMPORTANT: The --window-size element must come before other elements on the command line for the padding value to have an effect.

The minimum window size and padding can also be read from a file: -

    spacefm -g --window-size @/tmp/dialog-wsize
+
    spacefm -g --window-size @/tmp/dialog-wsize \
+	       --button ok
When the file is changed, the window will be resized to the specified size. As the dialog is running, in another terminal run: 
    echo 500x500 > /tmp/dialog-wsize
@@ -7849,11 +7860,11 @@
-

Copyright (C) 2015 +

Copyright (C) 2016 IgnorantGuru

DISCLAIMER: While the authors, copyright holders, and maintainers of this software endeavour to keep all content up to date and valuable, we make no representations or warranties of any kind, express or implied, about the completeness, accuracy, reliability, suitability or availability with respect to the software or the information, communications, products, services, or related graphics for any purpose. Any reliance you place on such content is therefore strictly AT YOUR OWN RISK.

-

Updated 2015-10-17  (SpaceFM version 1.0.4) +

Updated 2016-01-20  (SpaceFM version 1.0.5)

diff -Nru spacefm-1.0.4/data/ui/about-dlg.ui spacefm-1.0.5/data/ui/about-dlg.ui --- spacefm-1.0.4/data/ui/about-dlg.ui 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/data/ui/about-dlg.ui 2016-01-20 13:22:23.000000000 +0000 @@ -6,9 +6,9 @@ GDK_WINDOW_TYPE_HINT_DIALOG SpaceFM by IgnorantGuru - Copyright (C) 2015 GPL3+ + Copyright (C) 2016 GPL3+ http://ignorantguru.github.io/spacefm/ - SpaceFM - Copyright (C) 2015 GPL3+ + SpaceFM - Copyright (C) 2016 IgnorantGuru GPL3+ 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 3 of the License, or (at your option) any later version. diff -Nru spacefm-1.0.4/data/ui/prefdlg2.ui spacefm-1.0.5/data/ui/prefdlg2.ui --- spacefm-1.0.4/data/ui/prefdlg2.ui 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/data/ui/prefdlg2.ui 2016-01-20 13:22:23.000000000 +0000 @@ -18,6 +18,9 @@ 512x512 + 384x384 + + 256x256 @@ -67,6 +70,9 @@ 512x512 + 384x384 + + 256x256 @@ -210,6 +216,12 @@ /usr/bin/ktsuss + /usr/bin/lxqt-sudo + + + /usr/bin/lxsu + + /usr/bin/su-to-root diff -Nru spacefm-1.0.4/data/ui/prefdlg.ui spacefm-1.0.5/data/ui/prefdlg.ui --- spacefm-1.0.4/data/ui/prefdlg.ui 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/data/ui/prefdlg.ui 2016-01-20 13:22:23.000000000 +0000 @@ -18,6 +18,9 @@ 512x512 + 384x384 + + 256x256 @@ -67,6 +70,9 @@ 512x512 + 384x384 + + 256x256 @@ -210,6 +216,12 @@ /usr/bin/ktsuss + /usr/bin/lxqt-sudo + + + /usr/bin/lxsu + + /usr/bin/su-to-root diff -Nru spacefm-1.0.4/debian/changelog spacefm-1.0.5/debian/changelog --- spacefm-1.0.4/debian/changelog 2015-10-19 15:23:40.000000000 +0000 +++ spacefm-1.0.5/debian/changelog 2016-03-03 08:03:15.000000000 +0000 @@ -1,3 +1,22 @@ +spacefm (1.0.5-1) unstable; urgency=medium + + * New upstream release. + * debian/copyright: + + Update dates. + + Change license for Makefile.in to GAP~Makefile.in. + * Drop debian/menu file. + * Add debian/patches/drop_spacefm-installer.patch to drop spacefm-installer + script which is no needed in binary system like Debian. + * Add debian/patches/fix-spelling-error.patch to fix lintian warning. + * debian/control: + + Bump to Standards-Version to 3.9.7. + + Use https for vcs-git. + * debian/rules: + + Use hardening=+all for build flags. + + Drop override_dh_installman. + + -- Mateusz Łukasik Wed, 02 Mar 2016 18:59:25 +0100 + spacefm (1.0.4-1) unstable; urgency=medium * New upstream release. diff -Nru spacefm-1.0.4/debian/control spacefm-1.0.5/debian/control --- spacefm-1.0.4/debian/control 2015-10-18 15:18:17.000000000 +0000 +++ spacefm-1.0.5/debian/control 2016-03-02 17:38:58.000000000 +0000 @@ -7,9 +7,9 @@ libglib2.0-dev, libstartup-notification0-dev, libdbus-1-dev, libgdk-pixbuf2.0-dev, libudev-dev, hicolor-icon-theme, libgtk-3-dev, libffmpegthumbnailer-dev -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Homepage: http://ignorantguru.github.io/spacefm/ -Vcs-Git: git://github.com/mati75/spacefm.git +Vcs-Git: https://github.com/mati75/spacefm.git Vcs-Browser: https://github.com/mati75/spacefm.git Package: spacefm diff -Nru spacefm-1.0.4/debian/copyright spacefm-1.0.5/debian/copyright --- spacefm-1.0.4/debian/copyright 2015-10-18 15:18:17.000000000 +0000 +++ spacefm-1.0.5/debian/copyright 2016-01-24 22:16:06.000000000 +0000 @@ -3,7 +3,7 @@ Source: https://github.com/IgnorantGuru/spacefm/tree/master/packages/ Files: * -Copyright: 2013-2014, IgnorantGuru +Copyright: 2013-2016, IgnorantGuru 2013-2014, BwackNinja License: GPL-3+ @@ -27,7 +27,7 @@ Files: Makefile.in data/Makefile.in src/Makefile.in Copyright: 1994-2013, Free Software Foundation, Inc. -License: permissive +License: GAP~Makefile.in This Makefile.in is free software; the Free Software Foundation gives unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved. @@ -55,7 +55,7 @@ License: GPL-2+ Files: debian/* -Copyright: 2013-2015 Mateusz Łukasik +Copyright: 2013-2016 Mateusz Łukasik License: GPL-3+ License: GPL-2+ diff -Nru spacefm-1.0.4/debian/menu spacefm-1.0.5/debian/menu --- spacefm-1.0.4/debian/menu 2015-10-18 15:18:17.000000000 +0000 +++ spacefm-1.0.5/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -?package(spacefm):needs="X11" section="Applications/File Management"\ - title="SpaceFM" longtitle="Multi-panel tabbed file manager"\ - description="SpaceFM is multi-panel tabbed file manager"\ - command="/usr/bin/spacefm" hints="File manager" diff -Nru spacefm-1.0.4/debian/patches/drop_spacefm-installer.patch spacefm-1.0.5/debian/patches/drop_spacefm-installer.patch --- spacefm-1.0.4/debian/patches/drop_spacefm-installer.patch 1970-01-01 00:00:00.000000000 +0000 +++ spacefm-1.0.5/debian/patches/drop_spacefm-installer.patch 2016-01-24 22:16:06.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Drop spacefm-installer to install, it is exactly + no needed in binary distributions like Debian. You can download + this script by hand from upstream git repository. I recommended + update spacefm to unstable version by that way. +Author: Mateusz Łukasik + +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,7 +5,7 @@ SUBDIRS = etc src data po + mimedir = $(datadir)/mime/packages + mime_DATA = src/mime-type/spacefm-mime.xml + +-bin_SCRIPTS = spacefm-installer ++bin_SCRIPTS = + + EXTRA_DIST = \ + autogen.sh \ +--- a/Makefile.in ++++ b/Makefile.in +@@ -386,7 +386,7 @@ top_srcdir = @top_srcdir@ + SUBDIRS = etc src data po + mimedir = $(datadir)/mime/packages + mime_DATA = src/mime-type/spacefm-mime.xml +-bin_SCRIPTS = spacefm-installer ++bin_SCRIPTS = + EXTRA_DIST = \ + autogen.sh \ + $(mime_DATA) \ diff -Nru spacefm-1.0.4/debian/patches/fix-spelling-error.patch spacefm-1.0.5/debian/patches/fix-spelling-error.patch --- spacefm-1.0.4/debian/patches/fix-spelling-error.patch 1970-01-01 00:00:00.000000000 +0000 +++ spacefm-1.0.5/debian/patches/fix-spelling-error.patch 2016-01-24 22:16:06.000000000 +0000 @@ -0,0 +1,1933 @@ +Description: Fix spelling error + +--- a/data/spacefm-manual-en.html ++++ b/data/spacefm-manual-en.html +@@ -2718,7 +2718,7 @@ Note that the PID of the task refers to + +

A single left-click on a task listed in the Task Manager will open a popup dialog showing stats, a progress bar, and an output monitor. Popup dialogs may also be automatically shown when errors occur, if option View|Task Manager|Popups|Popup All Tasks is checked, or based on a custom command's popup settings. The popup dialog's relationship to other windows may be controlled with options View|Task Manager|Popups|Stay On Top, Above Others, and All Workspaces. + +-

For internal tasks, the popup dialog will show the task's job ("Copy", etc), the current file being processed, the destination directory, brief or detailed stats, the status of the task ("Paused", etc), a progress bar, an output monitor used to show the details of any errors which have occured, and overwrite and error mode controls. ++

For internal tasks, the popup dialog will show the task's job ("Copy", etc), the current file being processed, the destination directory, brief or detailed stats, the status of the task ("Paused", etc), a progress bar, an output monitor used to show the details of any errors which have occurred, and overwrite and error mode controls. + +

If View|Task Manager|Popups|Overwrite Option is checked and the task is internal, the popup dialog will show a drop-down list which displays and allows you to change the overwrite mode of the task (what happens when a file being copied already exists): Ask (prompt to rename, overwrite, or skip each file), Overwrite All (overwrite all files), Skip All (never overwrite files), or Auto Rename (assign a unique filename). Clicking the Overwrite All, Skip All, or Auto Rename All button in an overwrite query dialog will also change the overwrite mode. Note that the overwrite mode you set only applies to future file conflicts in the current task. + +@@ -3428,7 +3428,7 @@ Run As Task, which is enabled by def +

When the Run In Terminal option is checked, the Run As Task option will be unchecked automatically as a convenience. Although not normally useful, it is possible to use these options together (just check Run As Task again after checking Run In Terminal). When both are checked, the terminal window itself is run as a task, the output monitor will generally be empty, and errors may not be detected. Mostly this is useful only for monitoring when the command has finished (when the terminal window closes, it will be removed from the Task Manager). Note that some terminal emulators cannot be run as a task by SpaceFM because the emulator does not start a new instance. + +

Popup Task
+-The Popup Task/Error/Output and Scroll options are only enabled if Run As Task is checked. If Popup Task is checked, the popup dialog for the task will be raised as soon as the task is added to the Task Manager, even if no output has occured. The output monitor will not be shown if the task completes in less than about one half second. ++The Popup Task/Error/Output and Scroll options are only enabled if Run As Task is checked. If Popup Task is checked, the popup dialog for the task will be raised as soon as the task is added to the Task Manager, even if no output has occurred. The output monitor will not be shown if the task completes in less than about one half second. + +

Use Popup Task if you want a popup anytime the task runs for more than a moment. When the task finishes, the popup will remain, allowing you to review any output. You can also close the monitor prematurely while the task is still running by clicking the Close button - the task will continue running in the Task Manager. + +--- a/po/af.po ++++ b/po/af.po +@@ -2528,13 +2528,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2546,7 +2546,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7223,7 +7223,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/ar.po ++++ b/po/ar.po +@@ -2552,13 +2552,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2570,7 +2570,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7286,7 +7286,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/bg.po ++++ b/po/bg.po +@@ -2529,13 +2529,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2547,7 +2547,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7224,7 +7224,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/bn_IN.po ++++ b/po/bn_IN.po +@@ -2529,13 +2529,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2547,7 +2547,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7235,7 +7235,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/ca.po ++++ b/po/ca.po +@@ -2535,13 +2535,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2553,7 +2553,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7240,7 +7240,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/cs.po ++++ b/po/cs.po +@@ -2542,13 +2542,13 @@ msgid "Creation Failed" + msgstr "Vytvoření se nezdařilo" + + #: ../src/settings.c:4373 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Při vytváření souboru README pro tento příkaz se vyskytla chyba." + + #: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "Při kopírování souborů s příkazy se vyskytla chyba\n\n%s" +@@ -2561,7 +2561,7 @@ msgstr "Chyba při kopírování" + #: ../src/settings.c:4569 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "Při kopírování souborů s daty příkazů se vyskytla chyba\n\n%s" +@@ -7258,7 +7258,7 @@ msgid "Change Desktop Item Name" + msgstr "Změnit název položky pracovní plochy" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Při přejmenovávání této položky plochy se vyskytla chyba." + + #: ../src/find-files.c:279 +--- a/po/da.po ++++ b/po/da.po +@@ -2537,13 +2537,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2555,7 +2555,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7241,7 +7241,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/de.po ++++ b/po/de.po +@@ -2718,13 +2718,13 @@ msgid "Creation Failed" + msgstr "Erzeugen gescheitert" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Fehler beim Erzeugen einer README-Datei für diesen Befehl." + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2739,7 +2739,7 @@ msgstr "Fehler beim Kopieren" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -8011,7 +8011,7 @@ msgid "Change Desktop Item Name" + msgstr "Name des Schreibtischobjekts ändern" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Beim Umbenennen dieses Schreibtischobjekts ist ein Fehler aufgetreten." + + #: ../src/find-files.c:279 +--- a/po/el.po ++++ b/po/el.po +@@ -2710,7 +2710,7 @@ msgid "Creation Failed" + msgstr "Η δημιουργία απέτυχε" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + "Παρουσιάστηκε σφάλμα κατά τη δημιουργία του αρχείου README για αυτήν την " + "εντολή." +@@ -2718,7 +2718,7 @@ msgstr "" + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2730,7 +2730,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7698,7 +7698,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/es.po ++++ b/po/es.po +@@ -2547,13 +2547,13 @@ msgid "Creation Failed" + msgstr "Falló la creación" + + #: ../src/settings.c:4373 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Ocurrió un error al crear un archivo README para esta orden." + + #: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "Ocurrió un error al copiar los archivos de orden\n\n%s" +@@ -2566,7 +2566,7 @@ msgstr "Error en la orden de copia" + #: ../src/settings.c:4569 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "Ocurrió un error al copiar los archivos de datos de orden\n\n%s" +@@ -7255,7 +7255,7 @@ msgid "Change Desktop Item Name" + msgstr "Cambiar nombre del elemento de escritorio" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Un error ocurrió al renombrar este elemento de escritorio." + + #: ../src/find-files.c:279 +--- a/po/et.po ++++ b/po/et.po +@@ -2535,13 +2535,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2553,7 +2553,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7238,7 +7238,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/eu.po ++++ b/po/eu.po +@@ -2532,13 +2532,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2550,7 +2550,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7229,7 +7229,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/fa.po ++++ b/po/fa.po +@@ -2526,13 +2526,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2544,7 +2544,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7213,7 +7213,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/fi.po ++++ b/po/fi.po +@@ -2535,13 +2535,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2553,7 +2553,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7238,7 +7238,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/fr.po ++++ b/po/fr.po +@@ -2540,13 +2540,13 @@ msgid "Creation Failed" + msgstr "Échec de la création" + + #: ../src/settings.c:4373 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Une erreur s'est produite lors de la création d'un fichier README pour cette commande." + + #: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "Une erreur s'est produite lors de la copie des fichiers de la commande\n\n%s" +@@ -2559,7 +2559,7 @@ msgstr "Erreur de copie de la commande" + #: ../src/settings.c:4569 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "Une erreur s'est produite lors de la copie des fichiers de données de la commande\n\n%s" +@@ -7248,7 +7248,7 @@ msgid "Change Desktop Item Name" + msgstr "Modifier le nom de l'élément « .desktop »" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Une erreur s'est produite lors du renommage de cet élément « .desktop »" + + #: ../src/find-files.c:279 +--- a/po/gl.po ++++ b/po/gl.po +@@ -2535,13 +2535,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2553,7 +2553,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7241,7 +7241,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/he.po ++++ b/po/he.po +@@ -2537,13 +2537,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2555,7 +2555,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7240,7 +7240,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/hr.po ++++ b/po/hr.po +@@ -2532,13 +2532,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2550,7 +2550,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7235,7 +7235,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/hu.po ++++ b/po/hu.po +@@ -2536,13 +2536,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2554,7 +2554,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7239,7 +7239,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/id.po ++++ b/po/id.po +@@ -2531,13 +2531,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2549,7 +2549,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7228,7 +7228,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/it.po ++++ b/po/it.po +@@ -2539,13 +2539,13 @@ msgid "Creation Failed" + msgstr "Creazione fallita" + + #: ../src/settings.c:4373 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Si è verificato un errore creando un file README per questo comando." + + #: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "Si è verificato un errore copiando i file di comando\n\n%s" +@@ -2558,7 +2558,7 @@ msgstr "Errore nel copiare il comando" + #: ../src/settings.c:4569 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "Si è verificato un errore copiando i files di dati del comando\n\n%s" +@@ -7247,7 +7247,7 @@ msgid "Change Desktop Item Name" + msgstr "Cambia nome ad icona del desktop" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Un errore è incorso rinominando questa icona del desktop." + + #: ../src/find-files.c:279 +--- a/po/ja.po ++++ b/po/ja.po +@@ -2533,13 +2533,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2551,7 +2551,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7230,7 +7230,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/km.po ++++ b/po/km.po +@@ -2532,13 +2532,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2550,7 +2550,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7223,7 +7223,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/ko.po ++++ b/po/ko.po +@@ -2531,13 +2531,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2549,7 +2549,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7222,7 +7222,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/lt.po ++++ b/po/lt.po +@@ -2515,13 +2515,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4335 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4496 ../src/ptk/ptk-handler.c:1279 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2534,7 +2534,7 @@ msgstr "" + #: ../src/settings.c:4531 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7205,7 +7205,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/ltg.po ++++ b/po/ltg.po +@@ -2497,13 +2497,13 @@ msgid "Creation Failed" + msgstr "Taiseišana naizadȧvȧ" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Kļūda faila README taiseišonā" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "Kļūda kopejūt kamandys failus\n\n%s" +@@ -2515,7 +2515,7 @@ msgstr "Kopeišonys kļūda" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "Kļūda kopejūt kamandys datu failus\n\n%s" +@@ -7108,7 +7108,7 @@ msgid "Change Desktop Item Name" + msgstr "Pōrsaukț dorbgolda elementu" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Kļūda pōrsaucūt itū dorbgolda elementu." + + #: ../src/find-files.c:279 +--- a/po/ml.po ++++ b/po/ml.po +@@ -2528,13 +2528,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2546,7 +2546,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7223,7 +7223,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/ms.po ++++ b/po/ms.po +@@ -2535,13 +2535,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2553,7 +2553,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7232,7 +7232,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/nb.po ++++ b/po/nb.po +@@ -2535,13 +2535,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2553,7 +2553,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7237,7 +7237,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/nl.po ++++ b/po/nl.po +@@ -2629,7 +2629,7 @@ msgid "Creation Failed" + msgstr "Aanmaken mislukt." + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + "Een fout deed zich voor tijdens het aanmaken van een README-bestand voor dit " + "commando." +@@ -2637,7 +2637,7 @@ msgstr "" + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2649,7 +2649,7 @@ msgstr "Kopieercommandofout" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7416,7 +7416,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/nn.po ++++ b/po/nn.po +@@ -2535,13 +2535,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2553,7 +2553,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7240,7 +7240,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/pl.po ++++ b/po/pl.po +@@ -2628,13 +2628,13 @@ msgid "Creation Failed" + msgstr "Nieudane utworzenie" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2646,7 +2646,7 @@ msgstr "Skopiuj błąd polecenia" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7396,7 +7396,7 @@ msgid "Change Desktop Item Name" + msgstr "Zmień nazwę skrótu na pulpicie" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Wystąpił błąd zmiany nazwy tego elementu pulpitu" + + #: ../src/find-files.c:279 +--- a/po/ps.po ++++ b/po/ps.po +@@ -2528,13 +2528,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2546,7 +2546,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7223,7 +7223,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/pt.po ++++ b/po/pt.po +@@ -2644,13 +2644,13 @@ msgid "Creation Failed" + msgstr "Falha na criação" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Ocorreu um erro ao criar o ficheiro README com este comando." + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2662,7 +2662,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7381,7 +7381,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -2542,13 +2542,13 @@ msgid "Creation Failed" + msgstr "Falha na criação" + + #: ../src/settings.c:4373 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Erro ao criar um arquivo README para este comando." + + #: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "Um erro ao copiar arquivos de comando\n\n%s" +@@ -2561,7 +2561,7 @@ msgstr "Erro de comando para copiar" + #: ../src/settings.c:4569 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "Ocorreu um erro ao copiar arquivos de dados de comando\n\n%s" +@@ -7250,7 +7250,7 @@ msgid "Change Desktop Item Name" + msgstr "Mudar nome do item na área de trabalho" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Ocorreu um erro ao renomear este item na área de trabalho." + + #: ../src/find-files.c:279 +--- a/po/ru.po ++++ b/po/ru.po +@@ -2549,13 +2549,13 @@ msgid "Creation Failed" + msgstr "Создание не удалось" + + #: ../src/settings.c:4373 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Произошла ошибка при создании файла README для этой команды" + + #: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "Произошла ошибка при копировании файлов команды\n\n%s" +@@ -2568,7 +2568,7 @@ msgstr "Ошибка команды ко + #: ../src/settings.c:4569 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "Произошла ошибка при копировании файлов данных для команды\n\n%s" +@@ -7273,7 +7273,7 @@ msgid "Change Desktop Item Name" + msgstr "Сменить имя элемента рабочего стола" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Произошла ошибка при переименовании элемента рабочего стола." + + #: ../src/find-files.c:279 +--- a/po/si_LK.po ++++ b/po/si_LK.po +@@ -2528,13 +2528,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2546,7 +2546,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7223,7 +7223,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/sk.po ++++ b/po/sk.po +@@ -2538,13 +2538,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2556,7 +2556,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7250,7 +7250,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/sl.po ++++ b/po/sl.po +@@ -2542,13 +2542,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2560,7 +2560,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7263,7 +7263,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/spacefm.pot ++++ b/po/spacefm.pot +@@ -2565,13 +2565,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4373 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2584,7 +2584,7 @@ msgstr "" + #: ../src/settings.c:4569 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7388,7 +7388,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/sr.po ++++ b/po/sr.po +@@ -2712,13 +2712,13 @@ msgid "Creation Failed" + msgstr "Стварање није успело" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Дошло је до грешке при стварању датотеке „README“ за ову наредбу" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2733,7 +2733,7 @@ msgstr "Умножи грешку нар + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7880,7 +7880,7 @@ msgid "Change Desktop Item Name" + msgstr "Преименуј име ставке радне површи" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Дошло је до грешке при преименовању ставке радне површи." + + #: ../src/find-files.c:279 +--- a/po/sr@latin.po ++++ b/po/sr@latin.po +@@ -2611,13 +2611,13 @@ msgid "Creation Failed" + msgstr "Kreiranje neuspelo" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Došlo je do greške pri kreiranju fajla PROČITAJ ME za ovu naredbu" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2632,7 +2632,7 @@ msgstr "Kopiraj grešku naredbe" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7435,7 +7435,7 @@ msgid "Change Desktop Item Name" + msgstr "Promeni ime za desktop stavku" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Došlo je do greške kod preimenovanja ove desktop stavke." + + #: ../src/find-files.c:279 +--- a/po/sv.po ++++ b/po/sv.po +@@ -2540,13 +2540,13 @@ msgid "Creation Failed" + msgstr "Skapandet misslyckades" + + #: ../src/settings.c:4373 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "Ett fel uppstod vid skapandet av README-filen för detta kommando." + + #: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "Ett fel uppstod vid kopiering av kommando filer\n\n%s" +@@ -2559,7 +2559,7 @@ msgstr "Kopiera kommando fel" + #: ../src/settings.c:4569 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "Ett fel uppstod vid kopiering av kommando datafiler\n\n%s" +@@ -7248,7 +7248,7 @@ msgid "Change Desktop Item Name" + msgstr "Ändra Skrivbordsobjekt Namn" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "Ett fel uppstod vid byte av namn på det här skrivbordsobjektet." + + #: ../src/find-files.c:279 +--- a/po/tr.po ++++ b/po/tr.po +@@ -2539,13 +2539,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4373 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2558,7 +2558,7 @@ msgstr "" + #: ../src/settings.c:4569 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7247,7 +7247,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/uk.po ++++ b/po/uk.po +@@ -2541,13 +2541,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4373 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2560,7 +2560,7 @@ msgstr "" + #: ../src/settings.c:4569 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7257,7 +7257,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/ur.po ++++ b/po/ur.po +@@ -2540,13 +2540,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2558,7 +2558,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7245,7 +7245,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/ur_PK.po ++++ b/po/ur_PK.po +@@ -2540,13 +2540,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2558,7 +2558,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7245,7 +7245,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/vi.po ++++ b/po/vi.po +@@ -2525,13 +2525,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2543,7 +2543,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7212,7 +7212,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/vi_VN.po ++++ b/po/vi_VN.po +@@ -2525,13 +2525,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2543,7 +2543,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7212,7 +7212,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -2572,13 +2572,13 @@ msgid "Creation Failed" + msgstr "创建失败" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "在为此命令创建 README 文件时出错" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2590,7 +2590,7 @@ msgstr "复制命令出错" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7279,7 +7279,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -2532,13 +2532,13 @@ msgid "Creation Failed" + msgstr "" + + #: ../src/settings.c:4331 +-msgid "An error occured creating a README file for this command." ++msgid "An error occurred creating a README file for this command." + msgstr "" + + #: ../src/settings.c:4492 + #, c-format + msgid "" +-"An error occured copying command files\n" ++"An error occurred copying command files\n" + "\n" + "%s" + msgstr "" +@@ -2550,7 +2550,7 @@ msgstr "" + #: ../src/settings.c:4527 + #, c-format + msgid "" +-"An error occured copying command data files\n" ++"An error occurred copying command data files\n" + "\n" + "%s" + msgstr "" +@@ -7223,7 +7223,7 @@ msgid "Change Desktop Item Name" + msgstr "" + + #: ../src/desktop/desktop-window.c:2049 +-msgid "An error occured renaming this desktop item." ++msgid "An error occurred renaming this desktop item." + msgstr "" + + #: ../src/find-files.c:279 +--- a/src/desktop/desktop-window.c ++++ b/src/desktop/desktop-window.c +@@ -2058,7 +2058,7 @@ void desktop_window_rename_selected_file + vfs_dir_emit_file_changed( self->dir, filename, file, FALSE ); + g_free( path ); + g_free( filename ); +- xset_msg_dialog( GTK_WIDGET( self ), GTK_MESSAGE_ERROR, _("Rename Error"), NULL, 0, _("An error occured renaming this desktop item."), NULL, NULL ); ++ xset_msg_dialog( GTK_WIDGET( self ), GTK_MESSAGE_ERROR, _("Rename Error"), NULL, 0, _("An error occurred renaming this desktop item."), NULL, NULL ); + break; + } + if ( self->dir ) +--- a/src/main-window.c ++++ b/src/main-window.c +@@ -1024,7 +1024,7 @@ void update_window_icon( GtkWindow* wind + } + else if ( error != NULL ) + { +- // An error occured on loading the icon ++ // An error occurred on loading the icon + fprintf( stderr, "spacefm: Unable to load the window icon " + "'%s' in - update_window_icon - %s\n", name, error->message); + g_error_free( error ); +--- a/src/ptk/ptk-handler.c ++++ b/src/ptk/ptk-handler.c +@@ -1278,7 +1278,7 @@ void ptk_handler_import( int mode, GtkWi + + if ( !ret || ( exit_status && WIFEXITED( exit_status ) ) ) + { +- msg = g_strdup_printf( _("An error occured copying command files\n\n%s"), ++ msg = g_strdup_printf( _("An error occurred copying command files\n\n%s"), + stderr ? stderr : "" ); + GDK_THREADS_ENTER(); // due to dialog run causes low level thread lock + xset_msg_dialog( NULL, GTK_MESSAGE_ERROR, _("Copy Command Error"), NULL, +--- a/src/settings.c ++++ b/src/settings.c +@@ -4390,7 +4390,7 @@ char* xset_custom_get_help( GtkWidget* p + return path; + g_free( path ); + xset_msg_dialog( parent, 0, _("Creation Failed"), NULL, 0, +- _("An error occured creating a README file for this command."), ++ _("An error occurred creating a README file for this command."), + NULL, NULL ); + return NULL; + } +@@ -4551,7 +4551,7 @@ void xset_custom_copy_files( XSet* src, + + if ( !ret || ( exit_status && WIFEXITED( exit_status ) ) ) + { +- msg = g_strdup_printf( _("An error occured copying command files\n\n%s"), ++ msg = g_strdup_printf( _("An error occurred copying command files\n\n%s"), + stderr ? stderr : "" ); + xset_msg_dialog( NULL, GTK_MESSAGE_ERROR, _("Copy Command Error"), NULL, + 0, msg, NULL, NULL ); +@@ -4586,7 +4586,7 @@ void xset_custom_copy_files( XSet* src, + printf( "%s%s", stdout, stderr ); + if ( !ret || ( exit_status && WIFEXITED( exit_status ) ) ) + { +- msg = g_strdup_printf( _("An error occured copying command data files\n\n%s"), ++ msg = g_strdup_printf( _("An error occurred copying command data files\n\n%s"), + stderr ? stderr : "" ); + xset_msg_dialog( NULL, GTK_MESSAGE_ERROR, _("Copy Command Error"), NULL, + 0, msg, NULL, NULL ); +@@ -10446,7 +10446,7 @@ void xset_set_window_icon( GtkWindow* wi + } + else if ( error ) + { +- // An error occured on loading the icon ++ // An error occurred on loading the icon + fprintf( stderr, "spacefm: Unable to load the window icon " + "'%s' in - xset_set_window_icon - %s\n", name, error->message); + g_error_free( error ); diff -Nru spacefm-1.0.4/debian/patches/series spacefm-1.0.5/debian/patches/series --- spacefm-1.0.4/debian/patches/series 2015-10-18 15:18:17.000000000 +0000 +++ spacefm-1.0.5/debian/patches/series 2016-01-24 22:16:06.000000000 +0000 @@ -1 +1,3 @@ update_desktop_files.patch +drop_spacefm-installer.patch +fix-spelling-error.patch diff -Nru spacefm-1.0.4/debian/rules spacefm-1.0.5/debian/rules --- spacefm-1.0.4/debian/rules 2015-10-18 15:18:17.000000000 +0000 +++ spacefm-1.0.5/debian/rules 2016-03-03 08:03:04.000000000 +0000 @@ -7,6 +7,7 @@ CONFIGURE_COMMON_FLAGS += --disable-pixmaps LDFLAGS += -Wl,-z,defs -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ --with autoreconf @@ -34,8 +35,5 @@ endif dh_install --fail-missing -override_dh_installman: - dh_installman - override_dh_auto_clean: rm -rf debian/build-gtk2 debian/build-gtk3 diff -Nru spacefm-1.0.4/distros/debian/changelog spacefm-1.0.5/distros/debian/changelog --- spacefm-1.0.4/distros/debian/changelog 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/distros/debian/changelog 2016-01-20 13:22:23.000000000 +0000 @@ -1,5 +1,5 @@ -spacefm (1.0.4-1) unstable; urgency=low +spacefm (1.0.5-1) unstable; urgency=low * release - -- IgnorantGuru Sat, 17 Oct 2015 19:27:25 +0000 + -- IgnorantGuru Wed, 20 Jan 2016 13:20:19 +0000 diff -Nru spacefm-1.0.4/po/spacefm.pot spacefm-1.0.5/po/spacefm.pot --- spacefm-1.0.4/po/spacefm.pot 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/po/spacefm.pot 2016-01-20 13:22:23.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: spacefm 1.0.3+next\n" +"Project-Id-Version: spacefm 1.0.4+next\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-06 20:48+0000\n" +"POT-Creation-Date: 2015-10-18 17:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -147,7 +147,7 @@ msgid "_Command:" msgstr "" -#: ../data/ui/appchooserdlg.ui.h:7 ../src/settings.c:11572 +#: ../data/ui/appchooserdlg.ui.h:7 ../src/settings.c:11575 #: ../src/ptk/ptk-file-misc.c:2131 ../src/item-prop.c:1744 msgid "_Browse" msgstr "" @@ -204,7 +204,7 @@ msgid "_Accessed:" msgstr "" -#: ../data/ui/file_properties.ui.h:12 ../src/settings.c:12405 +#: ../data/ui/file_properties.ui.h:12 ../src/settings.c:12408 msgid "_Info" msgstr "" @@ -256,7 +256,7 @@ msgid "Recursive (apply changes to folders and their contents)" msgstr "" -#: ../data/ui/file_properties.ui.h:25 ../src/settings.c:12408 +#: ../data/ui/file_properties.ui.h:25 ../src/settings.c:12411 msgid "_Permissions" msgstr "" @@ -483,7 +483,7 @@ msgstr "" #: ../data/ui/prefdlg.ui.h:21 ../data/ui/prefdlg2.ui.h:21 -#: ../src/settings.c:169 +#: ../src/settings.c:170 msgid "Show Thumbnails" msgstr "" @@ -652,15 +652,15 @@ msgid "Too many columns (>%d) in %s" msgstr "" -#: ../src/cust-dialog.c:632 ../src/cust-dialog.c:1653 -#: ../src/cust-dialog.c:1667 ../src/cust-dialog.c:1886 ../src/item-prop.c:799 +#: ../src/cust-dialog.c:632 ../src/cust-dialog.c:1651 +#: ../src/cust-dialog.c:1665 ../src/cust-dialog.c:1884 ../src/item-prop.c:799 #, c-format msgid "error reading file %s: %s" msgstr "" #. modified = TRUE; -#: ../src/cust-dialog.c:640 ../src/cust-dialog.c:1687 -#: ../src/cust-dialog.c:1900 ../src/ptk/ptk-handler.c:706 +#: ../src/cust-dialog.c:640 ../src/cust-dialog.c:1685 +#: ../src/cust-dialog.c:1898 ../src/ptk/ptk-handler.c:706 #: ../src/item-prop.c:811 #, c-format msgid "file '%s' contents are not valid UTF-8" @@ -676,77 +676,77 @@ msgid "file '%s' is not a regular file" msgstr "" -#: ../src/cust-dialog.c:995 ../src/cust-dialog.c:1331 -#: ../src/cust-dialog.c:3472 +#: ../src/cust-dialog.c:995 ../src/cust-dialog.c:1329 +#: ../src/cust-dialog.c:3470 msgid "Dynamic resize requires width and height > 0" msgstr "" -#: ../src/cust-dialog.c:1304 +#: ../src/cust-dialog.c:1302 #, c-format msgid "internal command %s requires an argument" msgstr "" -#: ../src/cust-dialog.c:1352 +#: ../src/cust-dialog.c:1350 #, c-format msgid "element '%s' does not exist" msgstr "" -#: ../src/cust-dialog.c:1397 +#: ../src/cust-dialog.c:1395 #, c-format msgid "internal command press is invalid for non-button %s" msgstr "" -#: ../src/cust-dialog.c:1431 +#: ../src/cust-dialog.c:1429 #, c-format msgid "internal command un/select is invalid for %s" msgstr "" -#: ../src/cust-dialog.c:1465 ../src/cust-dialog.c:1614 -#: ../src/cust-dialog.c:1621 +#: ../src/cust-dialog.c:1463 ../src/cust-dialog.c:1612 +#: ../src/cust-dialog.c:1619 #, c-format msgid "error writing file %s: %s" msgstr "" -#: ../src/cust-dialog.c:1594 +#: ../src/cust-dialog.c:1592 #, c-format msgid "'%s' is not an internal command" msgstr "" -#: ../src/cust-dialog.c:1640 +#: ../src/cust-dialog.c:1638 #, c-format msgid "error creating file %s: %s" msgstr "" -#: ../src/cust-dialog.c:1756 +#: ../src/cust-dialog.c:1754 #, c-format msgid "pipe '%s' data is not valid UTF-8" msgstr "" -#: ../src/cust-dialog.c:1792 ../src/ptk/ptk-file-task.c:1778 +#: ../src/cust-dialog.c:1790 ../src/ptk/ptk-file-task.c:1778 msgid "[ SNIP - additional output above has been trimmed from this log ]\n" msgstr "" -#: ../src/cust-dialog.c:1897 +#: ../src/cust-dialog.c:1895 msgid "( file contents are not valid UTF-8 )" msgstr "" -#: ../src/cust-dialog.c:2021 +#: ../src/cust-dialog.c:2019 #, c-format msgid "prefix '%s' is not a valid variable name" msgstr "" #. pack timeout button first -#: ../src/cust-dialog.c:2292 ../src/cust-dialog.c:3640 -#: ../src/cust-dialog.c:3700 +#: ../src/cust-dialog.c:2290 ../src/cust-dialog.c:3638 +#: ../src/cust-dialog.c:3698 msgid "Pause" msgstr "" -#: ../src/cust-dialog.c:3020 +#: ../src/cust-dialog.c:3018 #, c-format msgid "file '%s' is not a regular file or a pipe" msgstr "" -#: ../src/cust-dialog.c:3761 +#: ../src/cust-dialog.c:3759 #, c-format msgid "" "SpaceFM Dialog creates a custom GTK dialog based on the GUI elements you\n" @@ -755,56 +755,56 @@ "can modify elements, and outputs evaluatable/parsable results.\n" msgstr "" -#: ../src/cust-dialog.c:3762 +#: ../src/cust-dialog.c:3760 #, c-format msgid "Usage:\n" msgstr "" -#: ../src/cust-dialog.c:3763 +#: ../src/cust-dialog.c:3761 #, c-format msgid " spacefm --dialog|-g {ELEMENT [OPTIONS] [ARGUMENTS...]} ...\n" msgstr "" -#: ../src/cust-dialog.c:3764 +#: ../src/cust-dialog.c:3762 #, c-format msgid "Example:\n" msgstr "" -#: ../src/cust-dialog.c:3765 +#: ../src/cust-dialog.c:3763 #, c-format msgid " spacefm -g --label \"A message\" --button ok\n" msgstr "" -#: ../src/cust-dialog.c:3766 +#: ../src/cust-dialog.c:3764 #, c-format msgid "" "\n" "ELEMENT: OPTIONS & ARGUMENTS:\n" msgstr "" -#: ../src/cust-dialog.c:3767 +#: ../src/cust-dialog.c:3765 #, c-format msgid "-------- --------------------\n" msgstr "" -#: ../src/cust-dialog.c:3778 +#: ../src/cust-dialog.c:3776 #, c-format msgid "" "\n" "The following arguments may be used as shown above:\n" msgstr "" -#: ../src/cust-dialog.c:3779 +#: ../src/cust-dialog.c:3777 #, c-format msgid " STOCK %s\n" msgstr "" -#: ../src/cust-dialog.c:3780 +#: ../src/cust-dialog.c:3778 #, c-format msgid " ICON An icon name, eg: gtk-open\n" msgstr "" -#: ../src/cust-dialog.c:3781 +#: ../src/cust-dialog.c:3779 #, c-format msgid "" " @FILE A text file from which to read a value. In some cases this " @@ -814,12 +814,12 @@ " element. In other cases, the file specifies an initial value.\n" msgstr "" -#: ../src/cust-dialog.c:3782 +#: ../src/cust-dialog.c:3780 #, c-format msgid " SAVEFILE A viewer's or editor's contents are saved to this file.\n" msgstr "" -#: ../src/cust-dialog.c:3783 +#: ../src/cust-dialog.c:3781 #, c-format msgid "" " COMMAND An internal command or executable followed by arguments. " @@ -833,7 +833,7 @@ " %%%% %%\n" msgstr "" -#: ../src/cust-dialog.c:3784 +#: ../src/cust-dialog.c:3782 #, c-format msgid "" " LABEL The following escape sequences in LABEL are unescaped:\n" @@ -846,7 +846,7 @@ " --label '~This is plain. This is bold.'\n" msgstr "" -#: ../src/cust-dialog.c:3786 +#: ../src/cust-dialog.c:3784 #, c-format msgid "" "\n" @@ -857,21 +857,21 @@ " --input --font \"Times New Roman 16\" \"Default Text\"\n" msgstr "" -#: ../src/cust-dialog.c:3788 +#: ../src/cust-dialog.c:3786 #, c-format msgid "" "\n" "INTERNAL COMMANDS:\n" msgstr "" -#: ../src/cust-dialog.c:3799 +#: ../src/cust-dialog.c:3797 #, c-format msgid "" "\n" "EXAMPLE WITH COMMANDS:\n" msgstr "" -#: ../src/cust-dialog.c:3800 +#: ../src/cust-dialog.c:3798 #, c-format msgid "" " spacefm -g --label \"Enter some text and press Enter:\" \\\n" @@ -880,14 +880,14 @@ " --button ok\n" msgstr "" -#: ../src/cust-dialog.c:3802 +#: ../src/cust-dialog.c:3800 #, c-format msgid "" "\n" "EXAMPLE SCRIPT:\n" msgstr "" -#: ../src/cust-dialog.c:3803 +#: ../src/cust-dialog.c:3801 #, c-format msgid "" " #!%s\n" @@ -902,19 +902,19 @@ " fi\n" msgstr "" -#: ../src/cust-dialog.c:3804 +#: ../src/cust-dialog.c:3802 #, c-format msgid "" "\n" "For full documentation and examples see the SpaceFM User's Manual:\n" msgstr "" -#: ../src/cust-dialog.c:3831 +#: ../src/cust-dialog.c:3829 #, c-format msgid "spacefm: argument is not valid UTF-8\n" msgstr "" -#: ../src/cust-dialog.c:3878 +#: ../src/cust-dialog.c:3876 msgid "invalid dialog option" msgstr "" @@ -1598,9 +1598,9 @@ #: ../src/main.c:1268 ../src/main.c:1346 ../src/main.c:1348 ../src/main.c:1456 #: ../src/main.c:1484 ../src/main.c:1486 ../src/main.c:1625 -#: ../src/settings.c:5872 ../src/settings.c:9225 +#: ../src/settings.c:5874 ../src/settings.c:9228 #: ../src/ptk/ptk-file-browser.c:2174 ../src/ptk/ptk-file-browser.c:2191 -#: ../src/ptk/ptk-file-browser.c:5536 ../src/ptk/ptk-file-browser.c:5544 +#: ../src/ptk/ptk-file-browser.c:5543 ../src/ptk/ptk-file-browser.c:5551 #: ../src/ptk/ptk-console-output.c:232 ../src/ptk/ptk-file-misc.c:2761 #: ../src/ptk/ptk-file-misc.c:3422 ../src/ptk/ptk-file-misc.c:3692 #: ../src/ptk/ptk-file-misc.c:3799 ../src/ptk/ptk-file-misc.c:4002 @@ -1654,16 +1654,16 @@ "%s" msgstr "" -#: ../src/main-window.c:306 ../src/settings.c:7206 +#: ../src/main-window.c:306 ../src/settings.c:7209 msgid "Choose Plugin File" msgstr "" #. get url -#: ../src/main-window.c:317 ../src/settings.c:7218 +#: ../src/main-window.c:317 ../src/settings.c:7221 msgid "Enter Plugin URL" msgstr "" -#: ../src/main-window.c:317 ../src/settings.c:7218 +#: ../src/main-window.c:317 ../src/settings.c:7221 msgid "" "Enter SpaceFM Plugin URL:\n" "\n" @@ -1694,12 +1694,12 @@ msgid "Overwrite Plugin ?" msgstr "" -#: ../src/main-window.c:385 ../src/settings.c:7226 +#: ../src/main-window.c:385 ../src/settings.c:7229 #: ../src/ptk/ptk-handler.c:2769 msgid "Error Creating Temp Directory" msgstr "" -#: ../src/main-window.c:386 ../src/settings.c:7227 +#: ../src/main-window.c:386 ../src/settings.c:7230 #: ../src/ptk/ptk-handler.c:2770 msgid "Unable to create temporary directory" msgstr "" @@ -1750,54 +1750,54 @@ "For more information, click the Help button below." msgstr "" -#: ../src/main-window.c:1812 +#: ../src/main-window.c:1871 msgid "Panel" msgstr "" -#: ../src/main-window.c:1866 ../src/settings.c:5761 ../src/settings.c:6071 -#: ../src/settings.c:7057 ../src/settings.c:7172 +#: ../src/main-window.c:1925 ../src/settings.c:5763 ../src/settings.c:6074 +#: ../src/settings.c:7060 ../src/settings.c:7175 #, c-format msgid "New _Command" msgstr "" -#: ../src/main-window.c:1976 +#: ../src/main-window.c:2035 #, c-format msgid "Show Panel %d" msgstr "" -#: ../src/main-window.c:2004 ../src/settings.c:8167 ../src/settings.c:11545 -#: ../src/settings.c:11561 ../src/settings.c:12085 +#: ../src/main-window.c:2063 ../src/settings.c:8170 ../src/settings.c:11548 +#: ../src/settings.c:11564 ../src/settings.c:12088 msgid "_File" msgstr "" -#: ../src/main-window.c:2007 ../src/settings.c:12174 +#: ../src/main-window.c:2066 ../src/settings.c:12177 msgid "_View" msgstr "" -#: ../src/main-window.c:2010 ../src/settings.c:12517 +#: ../src/main-window.c:2069 ../src/settings.c:12520 msgid "_Devices" msgstr "" -#: ../src/main-window.c:2014 ../src/settings.c:11169 ../src/settings.c:11918 -#: ../src/settings.c:12150 ../src/settings.c:12529 +#: ../src/main-window.c:2073 ../src/settings.c:11172 ../src/settings.c:11921 +#: ../src/settings.c:12153 ../src/settings.c:12532 msgid "_Bookmarks" msgstr "" -#: ../src/main-window.c:2017 +#: ../src/main-window.c:2076 msgid "_Plugins" msgstr "" -#: ../src/main-window.c:2021 +#: ../src/main-window.c:2080 msgid "_Tools" msgstr "" #. Help -#: ../src/main-window.c:2024 ../src/settings.c:1185 ../src/settings.c:8205 -#: ../src/settings.c:8777 ../src/settings.c:9143 ../src/settings.c:11229 +#: ../src/main-window.c:2083 ../src/settings.c:1188 ../src/settings.c:8208 +#: ../src/settings.c:8780 ../src/settings.c:9146 ../src/settings.c:11232 msgid "_Help" msgstr "" -#: ../src/main-window.c:2334 +#: ../src/main-window.c:2393 #, c-format msgid "" "Error: Unable to save session file. Do you want to exit without saving?\n" @@ -1805,459 +1805,459 @@ "( %s )" msgstr "" -#: ../src/main-window.c:2343 +#: ../src/main-window.c:2402 msgid "SpaceFM Error" msgstr "" -#: ../src/main-window.c:2359 +#: ../src/main-window.c:2418 msgid "Stop all tasks running in this window?" msgstr "" -#: ../src/main-window.c:2368 +#: ../src/main-window.c:2427 msgid "Aborting tasks..." msgstr "" -#: ../src/main-window.c:3581 +#: ../src/main-window.c:3640 #, c-format msgid " %s free / %s " msgstr "" -#: ../src/main-window.c:3588 +#: ../src/main-window.c:3647 #, c-format msgid "%sReading %s ..." msgstr "" -#: ../src/main-window.c:3645 +#: ../src/main-window.c:3704 #, c-format msgid " Link → %s" msgstr "" -#: ../src/main-window.c:3647 +#: ../src/main-window.c:3706 #, c-format msgid " Link → %s/" msgstr "" -#: ../src/main-window.c:3650 +#: ../src/main-window.c:3709 #, c-format msgid " !Link → %s/ (missing)" msgstr "" -#: ../src/main-window.c:3658 +#: ../src/main-window.c:3717 #, c-format msgid " Link → %s (%s)" msgstr "" -#: ../src/main-window.c:3661 +#: ../src/main-window.c:3720 #, c-format msgid " !Link → %s (missing)" msgstr "" -#: ../src/main-window.c:3668 +#: ../src/main-window.c:3727 #, c-format msgid " !Link → ( error reading target )" msgstr "" -#: ../src/main-window.c:3715 +#: ../src/main-window.c:3774 msgid "hidden" msgid_plural "hidden" msgstr[0] "" msgstr[1] "" -#: ../src/main-window.c:3718 +#: ../src/main-window.c:3777 #, c-format msgid "%s%d visible (%s) %s" msgid_plural "%s%d visible (%s) %s" msgstr[0] "" msgstr[1] "" -#: ../src/main-window.c:3723 +#: ../src/main-window.c:3782 #, c-format msgid "%s%d item %s" msgid_plural "%s%d items %s" msgstr[0] "" msgstr[1] "" -#: ../src/main-window.c:3980 +#: ../src/main-window.c:4039 msgid "Device manager key shortcuts are disabled in HAL mode" msgstr "" #. If you change "Status", also change it in on_task_button_press_event -#: ../src/main-window.c:4203 ../src/main-window.c:5680 +#: ../src/main-window.c:4262 ../src/main-window.c:5739 msgid "Status" msgstr "" -#: ../src/main-window.c:4203 +#: ../src/main-window.c:4262 msgid "#" msgstr "" -#: ../src/main-window.c:4203 ../src/ptk/ptk-file-misc.c:2086 +#: ../src/main-window.c:4262 ../src/ptk/ptk-file-misc.c:2086 #: ../src/find-files.c:921 ../src/exo/exo-thumbnail-preview.c:273 msgid "Folder" msgstr "" -#: ../src/main-window.c:4203 +#: ../src/main-window.c:4262 msgid "Item" msgstr "" -#: ../src/main-window.c:4204 +#: ../src/main-window.c:4263 msgid "To" msgstr "" -#: ../src/main-window.c:4204 +#: ../src/main-window.c:4263 msgid "Progress" msgstr "" -#: ../src/main-window.c:4204 +#: ../src/main-window.c:4263 msgid "Total" msgstr "" -#: ../src/main-window.c:4205 +#: ../src/main-window.c:4264 msgid "Started" msgstr "" -#: ../src/main-window.c:4205 +#: ../src/main-window.c:4264 msgid "Elapsed" msgstr "" -#: ../src/main-window.c:4205 +#: ../src/main-window.c:4264 msgid "Current" msgstr "" -#: ../src/main-window.c:4205 +#: ../src/main-window.c:4264 msgid "CRemain" msgstr "" -#: ../src/main-window.c:4206 +#: ../src/main-window.c:4265 msgid "Average" msgstr "" -#: ../src/main-window.c:4206 +#: ../src/main-window.c:4265 msgid "Remain" msgstr "" -#: ../src/main-window.c:4219 +#: ../src/main-window.c:4278 msgid "Reorder Columns Help" msgstr "" -#: ../src/main-window.c:4219 +#: ../src/main-window.c:4278 msgid "" "To change the order of the columns, drag the column header to the desired " "location." msgstr "" -#: ../src/main-window.c:5792 +#: ../src/main-window.c:5851 msgid "moving" msgstr "" -#: ../src/main-window.c:5793 +#: ../src/main-window.c:5852 msgid "copying" msgstr "" -#: ../src/main-window.c:5794 +#: ../src/main-window.c:5853 msgid "trashing" msgstr "" -#: ../src/main-window.c:5795 +#: ../src/main-window.c:5854 msgid "deleting" msgstr "" -#: ../src/main-window.c:5796 +#: ../src/main-window.c:5855 msgid "linking" msgstr "" -#: ../src/main-window.c:5797 +#: ../src/main-window.c:5856 msgid "changing" msgstr "" -#: ../src/main-window.c:5798 +#: ../src/main-window.c:5857 msgid "running" msgstr "" -#: ../src/main-window.c:5873 +#: ../src/main-window.c:5932 #, c-format msgid "%d error %s" msgstr "" -#: ../src/main-window.c:5874 +#: ../src/main-window.c:5933 #, c-format msgid "%d errors %s" msgstr "" -#: ../src/main-window.c:5890 ../src/ptk/ptk-file-task.c:1671 +#: ../src/main-window.c:5949 ../src/ptk/ptk-file-task.c:1671 #, c-format msgid "paused" msgstr "" -#: ../src/main-window.c:5892 ../src/ptk/ptk-file-task.c:1673 +#: ../src/main-window.c:5951 ../src/ptk/ptk-file-task.c:1673 #, c-format msgid "queued" msgstr "" -#: ../src/main-window.c:6225 ../src/ptk/ptk-file-browser.c:255 +#: ../src/main-window.c:6284 ../src/ptk/ptk-file-browser.c:255 #: ../src/find-files.c:906 msgid "Name" msgstr "" -#: ../src/main-window.c:6225 ../src/ptk/ptk-file-browser.c:255 +#: ../src/main-window.c:6284 ../src/ptk/ptk-file-browser.c:255 #: ../src/find-files.c:927 msgid "Size" msgstr "" -#: ../src/main-window.c:6225 ../src/ptk/ptk-file-browser.c:255 +#: ../src/main-window.c:6284 ../src/ptk/ptk-file-browser.c:255 #: ../src/find-files.c:931 msgid "Type" msgstr "" -#: ../src/main-window.c:6226 ../src/ptk/ptk-file-browser.c:256 +#: ../src/main-window.c:6285 ../src/ptk/ptk-file-browser.c:256 msgid "Permission" msgstr "" -#: ../src/main-window.c:6226 ../src/ptk/ptk-file-browser.c:256 +#: ../src/main-window.c:6285 ../src/ptk/ptk-file-browser.c:256 msgid "Owner" msgstr "" -#: ../src/main-window.c:6226 ../src/ptk/ptk-file-browser.c:256 +#: ../src/main-window.c:6285 ../src/ptk/ptk-file-browser.c:256 msgid "Modified" msgstr "" -#: ../src/main-window.c:6238 +#: ../src/main-window.c:6297 msgid "spacefm: invalid socket command\n" msgstr "" -#: ../src/main-window.c:6267 +#: ../src/main-window.c:6326 #, c-format msgid "spacefm: invalid option '%s'\n" msgstr "" -#: ../src/main-window.c:6270 +#: ../src/main-window.c:6329 #, c-format msgid "spacefm: option %s requires an argument\n" msgstr "" -#: ../src/main-window.c:6280 +#: ../src/main-window.c:6339 msgid "spacefm: invalid window\n" msgstr "" -#: ../src/main-window.c:6300 +#: ../src/main-window.c:6359 #, c-format msgid "spacefm: invalid window %s\n" msgstr "" -#: ../src/main-window.c:6310 +#: ../src/main-window.c:6369 #, c-format msgid "spacefm: invalid panel %d\n" msgstr "" -#: ../src/main-window.c:6317 +#: ../src/main-window.c:6376 #, c-format msgid "spacefm: panel %d is not visible\n" msgstr "" -#: ../src/main-window.c:6330 +#: ../src/main-window.c:6389 #, c-format msgid "spacefm: invalid tab %d\n" msgstr "" -#: ../src/main-window.c:6342 +#: ../src/main-window.c:6401 msgid "spacefm: command set requires an argument\n" msgstr "" -#: ../src/main-window.c:6368 ../src/main-window.c:6675 +#: ../src/main-window.c:6427 ../src/main-window.c:6734 #, c-format msgid "spacefm: invalid %s value\n" msgstr "" -#: ../src/main-window.c:6401 ../src/main-window.c:6553 +#: ../src/main-window.c:6460 ../src/main-window.c:6612 msgid "spacefm: invalid slider value\n" msgstr "" -#: ../src/main-window.c:6430 +#: ../src/main-window.c:6489 msgid "spacefm: invalid panel number\n" msgstr "" -#: ../src/main-window.c:6471 +#: ../src/main-window.c:6530 msgid "spacefm: invalid tab number\n" msgstr "" -#: ../src/main-window.c:6524 ../src/main-window.c:6859 -#: ../src/main-window.c:6986 ../src/main-window.c:7264 +#: ../src/main-window.c:6583 ../src/main-window.c:6918 +#: ../src/main-window.c:7045 ../src/main-window.c:7323 #, c-format msgid "spacefm: invalid property %s\n" msgstr "" -#: ../src/main-window.c:6573 +#: ../src/main-window.c:6632 msgid "spacefm: invalid column width\n" msgstr "" -#: ../src/main-window.c:6609 ../src/main-window.c:6636 -#: ../src/main-window.c:7052 +#: ../src/main-window.c:6668 ../src/main-window.c:6695 +#: ../src/main-window.c:7111 #, c-format msgid "spacefm: invalid column name '%s'\n" msgstr "" -#: ../src/main-window.c:6746 +#: ../src/main-window.c:6805 msgid "spacefm: text is not valid UTF-8\n" msgstr "" -#: ../src/main-window.c:6763 +#: ../src/main-window.c:6822 #, c-format msgid "spacefm: %s requires a file path\n" msgstr "" -#: ../src/main-window.c:6769 +#: ../src/main-window.c:6828 #, c-format msgid "spacefm: error reading file '%s'\n" msgstr "" -#: ../src/main-window.c:6775 +#: ../src/main-window.c:6834 #, c-format msgid "spacefm: file '%s' does not contain valid UTF-8 text\n" msgstr "" -#: ../src/main-window.c:6816 +#: ../src/main-window.c:6875 #, c-format msgid "spacefm: %s requires a directory path\n" msgstr "" -#: ../src/main-window.c:6822 +#: ../src/main-window.c:6881 #, c-format msgid "spacefm: directory '%s' does not exist\n" msgstr "" -#: ../src/main-window.c:6868 ../src/main-window.c:7877 -#: ../src/main-window.c:7904 +#: ../src/main-window.c:6927 ../src/main-window.c:7936 +#: ../src/main-window.c:7963 #, c-format msgid "spacefm: command %s requires an argument\n" msgstr "" -#: ../src/main-window.c:7272 ../src/main-window.c:7402 -#: ../src/main-window.c:7506 ../src/main-window.c:7563 -#: ../src/main-window.c:7614 ../src/main-window.c:7953 +#: ../src/main-window.c:7331 ../src/main-window.c:7461 +#: ../src/main-window.c:7565 ../src/main-window.c:7622 +#: ../src/main-window.c:7673 ../src/main-window.c:8012 #, c-format msgid "spacefm: %s requires two arguments\n" msgstr "" -#: ../src/main-window.c:7300 ../src/main-window.c:7430 +#: ../src/main-window.c:7359 ../src/main-window.c:7489 #, c-format msgid "spacefm: invalid task '%s'\n" msgstr "" -#: ../src/main-window.c:7305 +#: ../src/main-window.c:7364 #, c-format msgid "spacefm: internal task %s is read-only\n" msgstr "" -#: ../src/main-window.c:7357 +#: ../src/main-window.c:7416 #, c-format msgid "spacefm: task property '%s' is read-only\n" msgstr "" -#: ../src/main-window.c:7374 +#: ../src/main-window.c:7433 #, c-format msgid "spacefm: invalid queue_state '%s'\n" msgstr "" -#: ../src/main-window.c:7392 ../src/main-window.c:7493 +#: ../src/main-window.c:7451 ../src/main-window.c:7552 #, c-format msgid "spacefm: invalid task property '%s'\n" msgstr "" -#: ../src/main-window.c:7549 ../src/main-window.c:7779 -#: ../src/main-window.c:7800 +#: ../src/main-window.c:7608 ../src/main-window.c:7838 +#: ../src/main-window.c:7859 #, c-format msgid "spacefm: no such directory '%s'\n" msgstr "" -#: ../src/main-window.c:7556 ../src/main-window.c:7607 -#: ../src/main-window.c:7642 ../src/main-window.c:7786 +#: ../src/main-window.c:7615 ../src/main-window.c:7666 +#: ../src/main-window.c:7701 ../src/main-window.c:7845 #, c-format msgid "spacefm: invalid %s task option '%s'\n" msgstr "" -#: ../src/main-window.c:7623 +#: ../src/main-window.c:7682 #, c-format msgid "spacefm: no such file '%s'\n" msgstr "" -#: ../src/main-window.c:7636 +#: ../src/main-window.c:7695 #, c-format msgid "spacefm: task type %s requires udev build\n" msgstr "" -#: ../src/main-window.c:7648 +#: ../src/main-window.c:7707 #, c-format msgid "spacefm: task type %s requires TARGET argument\n" msgstr "" #. not a valid url -#: ../src/main-window.c:7673 ../src/main-window.c:7696 -#: ../src/main-window.c:7740 +#: ../src/main-window.c:7732 ../src/main-window.c:7755 +#: ../src/main-window.c:7799 #, c-format msgid "spacefm: invalid TARGET '%s'\n" msgstr "" -#: ../src/main-window.c:7819 +#: ../src/main-window.c:7878 #, c-format msgid "spacefm: relative path '%s' requires %s option --dir DIR\n" msgstr "" -#: ../src/main-window.c:7843 +#: ../src/main-window.c:7902 #, c-format msgid "spacefm: task type %s requires FILE argument(s)\n" msgstr "" -#: ../src/main-window.c:7868 +#: ../src/main-window.c:7927 #, c-format msgid "spacefm: invalid task type '%s'\n" msgstr "" -#: ../src/main-window.c:7892 +#: ../src/main-window.c:7951 #, c-format msgid "spacefm: invalid keycode '%s'\n" msgstr "" -#: ../src/main-window.c:7911 +#: ../src/main-window.c:7970 #, c-format msgid "spacefm: custom command or submenu '%s' not found\n" msgstr "" -#: ../src/main-window.c:7923 +#: ../src/main-window.c:7982 #, c-format msgid "spacefm: item '%s' context hidden or disabled\n" msgstr "" -#: ../src/main-window.c:7959 +#: ../src/main-window.c:8018 #, c-format msgid "spacefm: invalid event type '%s'\n" msgstr "" -#: ../src/main-window.c:7985 +#: ../src/main-window.c:8044 #, c-format msgid "spacefm: event handler not found\n" msgstr "" -#: ../src/main-window.c:7996 +#: ../src/main-window.c:8055 #, c-format msgid "spacefm: invalid socket method '%s'\n" msgstr "" -#: ../src/pref-dialog.c:163 ../src/pref-dialog.c:175 ../src/settings.c:159 +#: ../src/pref-dialog.c:165 ../src/pref-dialog.c:177 ../src/settings.c:160 msgid "Default" msgstr "" -#: ../src/pref-dialog.c:195 +#: ../src/pref-dialog.c:197 msgid "Choose Desktop Font" msgstr "" -#: ../src/pref-dialog.c:196 +#: ../src/pref-dialog.c:198 msgid "Example Item 0123456789" msgstr "" -#: ../src/pref-dialog.c:440 +#: ../src/pref-dialog.c:442 msgid "Transparency Requirements" msgstr "" -#: ../src/pref-dialog.c:441 +#: ../src/pref-dialog.c:443 msgid "" "General Note: For desktop transparency to work, you need to be running a " "compositing window manager or separate compositor like compton or xcompmgr. " @@ -2267,11 +2267,11 @@ "This message will not repeat." msgstr "" -#: ../src/pref-dialog.c:773 +#: ../src/pref-dialog.c:775 msgid "Limited Terminal Emulator Selected" msgstr "" -#: ../src/pref-dialog.c:773 +#: ../src/pref-dialog.c:775 msgid "" "Due to limitations of gnome-terminal, konsole, lxterminal, and urxvtc, use " "of these terminals with SpaceFM may prevent the Run As Task and Run In " @@ -2282,7 +2282,7 @@ msgstr "" #. task -#: ../src/pref-dialog.c:823 +#: ../src/pref-dialog.c:825 #, c-format msgid "" "You will now be asked for your root password to save the root settings for " @@ -2291,12 +2291,12 @@ "these settings are best protected by root." msgstr "" -#: ../src/pref-dialog.c:824 ../src/pref-dialog.c:826 +#: ../src/pref-dialog.c:826 ../src/pref-dialog.c:828 msgid "Save Root Settings" msgstr "" #. also in aboutdlg.ui -#: ../src/settings.c:145 +#: ../src/settings.c:146 #, c-format msgid "" "Enter program or bash command line:\n" @@ -2313,7 +2313,7 @@ "\t$fm_panel, $fm_tab, $fm_command, etc" msgstr "" -#: ../src/settings.c:147 +#: ../src/settings.c:148 msgid "" "Enter an icon name, icon file path, or stock item name:\n" "\n" @@ -2321,7 +2321,7 @@ "various issues." msgstr "" -#: ../src/settings.c:149 +#: ../src/settings.c:150 msgid "" "Enter item name:\n" "\n" @@ -2329,7 +2329,7 @@ "shortcut key if desired." msgstr "" -#: ../src/settings.c:150 +#: ../src/settings.c:151 msgid "" "Enter new item name:\n" "\n" @@ -2340,125 +2340,125 @@ "Menu." msgstr "" -#: ../src/settings.c:155 +#: ../src/settings.c:156 msgid "Show Devices" msgstr "" -#: ../src/settings.c:156 +#: ../src/settings.c:157 msgid "Show Bookmarks" msgstr "" -#: ../src/settings.c:157 +#: ../src/settings.c:158 msgid "Show Tree" msgstr "" -#: ../src/settings.c:158 ../src/ptk/ptk-location-view.c:4278 +#: ../src/settings.c:159 ../src/ptk/ptk-location-view.c:4278 #: ../src/ptk/ptk-location-view.c:4740 #, c-format msgid "Home" msgstr "" -#: ../src/settings.c:160 +#: ../src/settings.c:161 msgid "Up" msgstr "" -#: ../src/settings.c:161 +#: ../src/settings.c:162 msgid "Back" msgstr "" -#: ../src/settings.c:162 +#: ../src/settings.c:163 msgid "Back History" msgstr "" -#: ../src/settings.c:163 +#: ../src/settings.c:164 msgid "Forward" msgstr "" -#: ../src/settings.c:164 +#: ../src/settings.c:165 msgid "Forward History" msgstr "" -#: ../src/settings.c:165 +#: ../src/settings.c:166 msgid "Refresh" msgstr "" -#: ../src/settings.c:166 +#: ../src/settings.c:167 msgid "New Tab" msgstr "" -#: ../src/settings.c:167 +#: ../src/settings.c:168 msgid "New Tab Here" msgstr "" -#: ../src/settings.c:168 +#: ../src/settings.c:169 msgid "Show Hidden" msgstr "" -#: ../src/settings.c:170 +#: ../src/settings.c:171 msgid "Large Icons" msgstr "" -#: ../src/settings.c:440 +#: ../src/settings.c:443 #, c-format msgid "%s: %s contains invalid characters - ignored" msgstr "" -#: ../src/settings.c:445 +#: ../src/settings.c:448 #, c-format msgid "%s: tmp_dir '%s' does not exist - reverting to %s" msgstr "" -#: ../src/settings.c:459 +#: ../src/settings.c:462 msgid "file not found" msgstr "" -#: ../src/settings.c:1049 ../src/settings.c:10891 +#: ../src/settings.c:1052 ../src/settings.c:10894 msgid "Ignore _Hide Policy" msgstr "" -#: ../src/settings.c:1056 ../src/settings.c:10985 +#: ../src/settings.c:1059 ../src/settings.c:10988 msgid "Ignore _No Policy" msgstr "" -#: ../src/settings.c:1066 ../src/settings.c:11591 +#: ../src/settings.c:1069 ../src/settings.c:11594 msgid "_FAQ" msgstr "" -#: ../src/settings.c:1076 ../src/settings.c:1081 ../src/settings.c:11735 -#: ../src/settings.c:11755 +#: ../src/settings.c:1079 ../src/settings.c:1084 ../src/settings.c:11738 +#: ../src/settings.c:11758 msgid "_Stop" msgstr "" -#: ../src/settings.c:1088 ../src/settings.c:11768 +#: ../src/settings.c:1091 ../src/settings.c:11771 msgid "Show _Manager" msgstr "" #. set->x used for task man height >=0.9.4 -#: ../src/settings.c:1095 ../src/settings.c:11774 +#: ../src/settings.c:1098 ../src/settings.c:11777 msgid "Auto-_Hide Manager" msgstr "" -#: ../src/settings.c:1102 ../src/settings.c:11839 +#: ../src/settings.c:1105 ../src/settings.c:11842 msgid "Err_ors" msgstr "" -#: ../src/settings.c:1109 ../src/settings.c:11714 +#: ../src/settings.c:1112 ../src/settings.c:11717 msgid "Current Re_main" msgstr "" -#: ../src/settings.c:1116 ../src/settings.c:11726 +#: ../src/settings.c:1119 ../src/settings.c:11729 msgid "A_verage Remain" msgstr "" -#: ../src/settings.c:1123 ../src/settings.c:11664 +#: ../src/settings.c:1126 ../src/settings.c:11667 msgid "_Folder" msgstr "" -#: ../src/settings.c:1155 ../src/settings.c:11816 +#: ../src/settings.c:1158 ../src/settings.c:11819 msgid "_Detailed Stats" msgstr "" -#: ../src/settings.c:1166 ../src/settings.c:10629 +#: ../src/settings.c:1169 ../src/settings.c:10632 msgid "Remo_ve / Eject" msgstr "" @@ -2466,39 +2466,39 @@ #. changes of this nature due to defaults no longer being saved #. in session file #. New > Import > -#: ../src/settings.c:1177 ../src/settings.c:8155 ../src/settings.c:11555 +#: ../src/settings.c:1180 ../src/settings.c:8158 ../src/settings.c:11558 msgid "_Import" msgstr "" -#: ../src/settings.c:1178 ../src/settings.c:11648 +#: ../src/settings.c:1181 ../src/settings.c:11651 msgid "_Task Manager" msgstr "" #. for rename dialog -#: ../src/settings.c:1181 ../src/settings.c:11178 +#: ../src/settings.c:1184 ../src/settings.c:11181 msgid "F_ilename" msgstr "" -#: ../src/settings.c:1182 ../src/settings.c:11189 +#: ../src/settings.c:1185 ../src/settings.c:11192 msgid "Typ_e" msgstr "" -#: ../src/settings.c:1183 ../src/settings.c:11193 +#: ../src/settings.c:1186 ../src/settings.c:11196 msgid "Ta_rget" msgstr "" -#: ../src/settings.c:1184 ../src/settings.c:11197 +#: ../src/settings.c:1187 ../src/settings.c:11200 msgid "Te_mplate" msgstr "" #. Change Save Session to Open URL - remove custom label/icon #. was previously used for 'Save Session' < 0.9.4 as XSET_MENU_NORMAL -#: ../src/settings.c:1310 ../src/settings.c:11296 +#: ../src/settings.c:1313 ../src/settings.c:11299 msgid "Open _URL" msgstr "" #. General -#: ../src/settings.c:1669 +#: ../src/settings.c:1672 msgid "" "# SpaceFM Session File\n" "\n" @@ -2509,31 +2509,31 @@ "\n" msgstr "" -#: ../src/settings.c:1844 +#: ../src/settings.c:1847 #, c-format msgid "Error saving file" msgstr "" -#: ../src/settings.c:1925 +#: ../src/settings.c:1928 #, c-format msgid "SpaceFM Error: Unable to autosave session file ( %s )\n" msgstr "" -#: ../src/settings.c:3379 +#: ../src/settings.c:3381 #, c-format msgid "" "\n" "Selected Menu Item '%s' As Handler\n" msgstr "" -#: ../src/settings.c:3464 +#: ../src/settings.c:3466 #, c-format msgid "" "Error reading root settings from %s/spacefm/ Commands run as root may " "present a security risk" msgstr "" -#: ../src/settings.c:3466 +#: ../src/settings.c:3468 #, c-format msgid "" "No root settings found in %s/spacefm/ Setting a root editor in Preferences " @@ -2541,34 +2541,34 @@ "present a security risk." msgstr "" -#: ../src/settings.c:4337 +#: ../src/settings.c:4339 msgid "Help Not Available" msgstr "" -#: ../src/settings.c:4338 +#: ../src/settings.c:4340 msgid "This plugin does not include a README file." msgstr "" -#: ../src/settings.c:4344 +#: ../src/settings.c:4346 msgid "Create README" msgstr "" -#: ../src/settings.c:4346 +#: ../src/settings.c:4348 msgid "" "No README file exists for this command.\n" "\n" "Create a default README file for you to fill in?" msgstr "" -#: ../src/settings.c:4370 +#: ../src/settings.c:4372 msgid "Creation Failed" msgstr "" -#: ../src/settings.c:4371 +#: ../src/settings.c:4373 msgid "An error occured creating a README file for this command." msgstr "" -#: ../src/settings.c:4532 ../src/ptk/ptk-handler.c:1281 +#: ../src/settings.c:4534 ../src/ptk/ptk-handler.c:1281 #, c-format msgid "" "An error occured copying command files\n" @@ -2577,11 +2577,11 @@ msgstr "" #. due to dialog run causes low level thread lock -#: ../src/settings.c:4534 ../src/settings.c:4569 ../src/ptk/ptk-handler.c:1284 +#: ../src/settings.c:4536 ../src/settings.c:4571 ../src/ptk/ptk-handler.c:1284 msgid "Copy Command Error" msgstr "" -#: ../src/settings.c:4567 +#: ../src/settings.c:4569 #, c-format msgid "" "An error occured copying command data files\n" @@ -2589,12 +2589,12 @@ "%s" msgstr "" -#: ../src/settings.c:4960 +#: ../src/settings.c:4962 #, c-format msgid "Error reading plugin file %s" msgstr "" -#: ../src/settings.c:5059 +#: ../src/settings.c:5061 #, c-format msgid "" "The imported plugin folder does not contain a valid plugin.\n" @@ -2602,11 +2602,11 @@ "(%s/)" msgstr "" -#: ../src/settings.c:5061 +#: ../src/settings.c:5063 msgid "Invalid Plugin" msgstr "" -#: ../src/settings.c:5160 +#: ../src/settings.c:5162 #, c-format msgid "" "The '%s' plugin has been copied to the design clipboard. Use View|Design " @@ -2616,7 +2616,7 @@ "Plugins menu." msgstr "" -#: ../src/settings.c:5162 +#: ../src/settings.c:5164 #, c-format msgid "" "The '%s' plugin has been copied to the design clipboard. Use View|Design " @@ -2631,7 +2631,7 @@ "system security." msgstr "" -#: ../src/settings.c:5194 +#: ../src/settings.c:5196 #, c-format msgid "" "Uninstall the '%s' plugin?\n" @@ -2639,73 +2639,73 @@ "( %s )" msgstr "" -#: ../src/settings.c:5197 ../src/settings.c:5205 +#: ../src/settings.c:5199 ../src/settings.c:5207 msgid "Uninstall Plugin" msgstr "" #. task -#: ../src/settings.c:5243 +#: ../src/settings.c:5245 msgid "Install Plugin" msgstr "" -#: ../src/settings.c:5497 +#: ../src/settings.c:5499 msgid "Save As Plugin File" msgstr "" #. tar and delete tmp files #. task -#: ../src/settings.c:5565 +#: ../src/settings.c:5567 msgid "Export Plugin" msgstr "" -#: ../src/settings.c:5599 +#: ../src/settings.c:5601 msgid "Export Error" msgstr "" -#: ../src/settings.c:5600 +#: ../src/settings.c:5602 msgid "Unable to create temporary files" msgstr "" -#: ../src/settings.c:5707 +#: ../src/settings.c:5709 #, c-format msgid "Bookmark target '%s' is missing or invalid." msgstr "" -#: ../src/settings.c:5711 +#: ../src/settings.c:5713 msgid "Invalid Bookmark Target" msgstr "" -#: ../src/settings.c:5763 +#: ../src/settings.c:5765 msgid "Change Item Name" msgstr "" -#: ../src/settings.c:6339 +#: ../src/settings.c:6342 msgid "Editor Not Set" msgstr "" -#: ../src/settings.c:6340 +#: ../src/settings.c:6343 msgid "Please set your editor in View|Preferences|Advanced" msgstr "" -#: ../src/settings.c:6351 +#: ../src/settings.c:6354 msgid "Root Editor Not Set" msgstr "" -#: ../src/settings.c:6352 +#: ../src/settings.c:6355 msgid "Please set root's editor in View|Preferences|Advanced" msgstr "" #. task -#: ../src/settings.c:6373 +#: ../src/settings.c:6376 #, c-format msgid "Edit %s" msgstr "" -#: ../src/settings.c:6554 +#: ../src/settings.c:6557 msgid "User's Manual Not Found" msgstr "" -#: ../src/settings.c:6556 +#: ../src/settings.c:6559 msgid "" "Read the user's manual online?\n" "\n" @@ -2714,11 +2714,11 @@ "Options|Manual Location." msgstr "" -#: ../src/settings.c:6605 +#: ../src/settings.c:6608 msgid "Manual Opened ?" msgstr "" -#: ../src/settings.c:6605 +#: ../src/settings.c:6608 msgid "" "The SpaceFM user's manual should have opened in your browser. If it didn't " "open, or if you would like to use a different browser, set your browser in " @@ -2727,11 +2727,11 @@ "This message will not repeat." msgstr "" -#: ../src/settings.c:6624 +#: ../src/settings.c:6627 msgid "( none )" msgstr "" -#: ../src/settings.c:6758 +#: ../src/settings.c:6761 #, c-format msgid "" "\t%s\n" @@ -2742,7 +2742,7 @@ "Press a different key or click Set to replace the current key assignment." msgstr "" -#: ../src/settings.c:6762 +#: ../src/settings.c:6765 #, c-format msgid "" "\t%s\n" @@ -2753,33 +2753,33 @@ "Press a different key or click Set to replace the current key assignment." msgstr "" -#: ../src/settings.c:6774 +#: ../src/settings.c:6777 #, c-format msgid "" "\t%s\n" "\tKeycode: %#4x Modifier: %#x" msgstr "" -#: ../src/settings.c:6804 +#: ../src/settings.c:6807 #, c-format msgid "" "Press your key combination for item '%s' then click Set. To remove the " "current key assignment, click Unset." msgstr "" -#: ../src/settings.c:6817 +#: ../src/settings.c:6820 msgid "Cancel" msgstr "" -#: ../src/settings.c:6823 +#: ../src/settings.c:6826 msgid "Unset" msgstr "" -#: ../src/settings.c:6836 +#: ../src/settings.c:6839 msgid "Set" msgstr "" -#: ../src/settings.c:6850 +#: ../src/settings.c:6853 msgid "Set Key" msgstr "" @@ -2789,30 +2789,30 @@ #. Special hack to add an icon chooser button when this dialog is called #. * to set icons - see xset_menu_cb() and set init "main_icon" #. * and xset_design_job -#: ../src/settings.c:6933 ../src/settings.c:8709 ../src/settings.c:9163 +#: ../src/settings.c:6936 ../src/settings.c:8712 ../src/settings.c:9166 msgid "Set Icon" msgstr "" -#: ../src/settings.c:7001 +#: ../src/settings.c:7004 msgid "Edit Command Line" msgstr "" -#: ../src/settings.c:7027 +#: ../src/settings.c:7030 msgid "Choose Custom Executable" msgstr "" -#: ../src/settings.c:7038 +#: ../src/settings.c:7041 msgid "Run As User" msgstr "" -#: ../src/settings.c:7038 +#: ../src/settings.c:7041 msgid "" "Run this command as username:\n" "\n" "( Leave blank for current user )" msgstr "" -#: ../src/settings.c:7046 +#: ../src/settings.c:7049 #, c-format msgid "" "You are adding a custom command to the Default menu item. This item will " @@ -2823,19 +2823,19 @@ "type." msgstr "" -#: ../src/settings.c:7047 +#: ../src/settings.c:7050 msgid "New Context Command" msgstr "" -#: ../src/settings.c:7058 +#: ../src/settings.c:7061 msgid "Set Item Name" msgstr "" -#: ../src/settings.c:7095 ../src/item-prop.c:1224 +#: ../src/settings.c:7098 ../src/item-prop.c:1224 msgid "Choose Folder" msgstr "" -#: ../src/settings.c:7137 +#: ../src/settings.c:7140 #, c-format msgid "" "You are adding a custom submenu to the Default menu item. This item will " @@ -2846,15 +2846,15 @@ "type." msgstr "" -#: ../src/settings.c:7137 +#: ../src/settings.c:7140 msgid "(none)" msgstr "" -#: ../src/settings.c:7146 +#: ../src/settings.c:7149 msgid "Set Submenu Name" msgstr "" -#: ../src/settings.c:7146 +#: ../src/settings.c:7149 msgid "" "Enter submenu name:\n" "\n" @@ -2862,11 +2862,11 @@ "shortcut key if desired." msgstr "" -#: ../src/settings.c:7146 +#: ../src/settings.c:7149 msgid "New _Submenu" msgstr "" -#: ../src/settings.c:7257 +#: ../src/settings.c:7260 #, c-format msgid "" "GTK bookmarks (%s) will be imported into the current or selected submenu. " @@ -2874,15 +2874,15 @@ "performance." msgstr "" -#: ../src/settings.c:7259 +#: ../src/settings.c:7262 msgid "Import GTK Bookmarks" msgstr "" -#: ../src/settings.c:7343 +#: ../src/settings.c:7346 msgid "( no name )" msgstr "" -#: ../src/settings.c:7347 +#: ../src/settings.c:7350 #, c-format msgid "" "Permanently remove the '%s' SUBMENU AND ALL ITEMS WITHIN IT?\n" @@ -2890,7 +2890,7 @@ "This action will delete all settings and files associated with these items." msgstr "" -#: ../src/settings.c:7352 +#: ../src/settings.c:7355 #, c-format msgid "" "Permanently remove the '%s' item?\n" @@ -2898,19 +2898,19 @@ "This action will delete all settings and files associated with this item." msgstr "" -#: ../src/settings.c:7373 ../src/ptk/ptk-handler.c:1888 +#: ../src/settings.c:7376 ../src/ptk/ptk-handler.c:1888 msgid "Confirm Remove" msgstr "" -#: ../src/settings.c:7447 ../src/item-prop.c:705 ../src/item-prop.c:717 +#: ../src/settings.c:7450 ../src/item-prop.c:705 ../src/item-prop.c:717 msgid "Are you sure?" msgstr "" -#: ../src/settings.c:7448 ../src/settings.c:7452 ../src/settings.c:7456 +#: ../src/settings.c:7451 ../src/settings.c:7455 ../src/settings.c:7459 msgid "Dialog Message" msgstr "" -#: ../src/settings.c:7448 ../src/settings.c:7452 ../src/settings.c:7456 +#: ../src/settings.c:7451 ../src/settings.c:7455 ../src/settings.c:7459 msgid "" "Enter the message to be displayed in this dialog:\n" "\n" @@ -2921,17 +2921,17 @@ #. Cut #. EDIT -#: ../src/settings.c:8075 ../src/settings.c:12253 +#: ../src/settings.c:8078 ../src/settings.c:12256 msgid "Cu_t" msgstr "" #. Copy -#: ../src/settings.c:8083 ../src/settings.c:11205 ../src/settings.c:12256 +#: ../src/settings.c:8086 ../src/settings.c:11208 ../src/settings.c:12259 msgid "_Copy" msgstr "" #. Paste -#: ../src/settings.c:8091 ../src/settings.c:12259 +#: ../src/settings.c:8094 ../src/settings.c:12262 msgid "_Paste" msgstr "" @@ -2942,135 +2942,135 @@ #. menu is shown from right-click on list #. Treeview widgets #. list buttons -#: ../src/settings.c:8099 ../src/ptk/ptk-file-menu.c:2286 +#: ../src/settings.c:8102 ../src/ptk/ptk-file-menu.c:2286 #: ../src/ptk/ptk-handler.c:2849 ../src/ptk/ptk-handler.c:3073 #: ../src/item-prop.c:1804 msgid "_Remove" msgstr "" #. Export -#: ../src/settings.c:8109 +#: ../src/settings.c:8112 msgid "E_xport" msgstr "" #. // New submenu -#: ../src/settings.c:8117 ../src/settings.c:11474 ../src/settings.c:12080 +#: ../src/settings.c:8120 ../src/settings.c:12083 msgid "_New" msgstr "" #. New > Bookmark -#: ../src/settings.c:8130 ../src/settings.c:10661 +#: ../src/settings.c:8133 ../src/settings.c:10664 msgid "_Bookmark" msgstr "" #. New > Application -#: ../src/settings.c:8134 +#: ../src/settings.c:8137 msgid "_Application" msgstr "" #. New > Command -#: ../src/settings.c:8138 +#: ../src/settings.c:8141 msgid "_Command" msgstr "" #. New > Submenu -#: ../src/settings.c:8145 +#: ../src/settings.c:8148 msgid "Sub_menu" msgstr "" #. New > Separator -#: ../src/settings.c:8151 +#: ../src/settings.c:8154 msgid "S_eparator" msgstr "" -#: ../src/settings.c:8169 ../src/settings.c:11548 ../src/settings.c:11564 +#: ../src/settings.c:8172 ../src/settings.c:11551 ../src/settings.c:11567 msgid "_URL" msgstr "" -#: ../src/settings.c:8172 +#: ../src/settings.c:8175 msgid "_GTK Bookmarks" msgstr "" #. "Add" submenu for builtin tool items -#: ../src/settings.c:8178 ../src/item-prop.c:1811 +#: ../src/settings.c:8181 ../src/item-prop.c:1811 msgid "_Add" msgstr "" -#: ../src/settings.c:8216 +#: ../src/settings.c:8219 msgid "T_ooltips" msgstr "" #. Key -#: ../src/settings.c:8225 +#: ../src/settings.c:8228 msgid "_Key Shortcut" msgstr "" #. edit as user -#: ../src/settings.c:8244 +#: ../src/settings.c:8247 msgid "_Edit Script" msgstr "" #. edit as root -#: ../src/settings.c:8254 +#: ../src/settings.c:8257 msgid "E_dit As Root" msgstr "" #. edit command line -#: ../src/settings.c:8268 +#: ../src/settings.c:8271 msgid "_Edit Command" msgstr "" #. Properties -#: ../src/settings.c:8278 ../src/settings.c:10847 +#: ../src/settings.c:8281 ../src/settings.c:10850 msgid "_Properties" msgstr "" -#: ../src/settings.c:9028 +#: ../src/settings.c:9031 msgid "Choose Icon" msgstr "" -#: ../src/settings.c:9152 +#: ../src/settings.c:9155 msgid "_Edit" msgstr "" #. Note: xset_text_dialog uses the title passed to know this is an #. icon chooser, so it adds a Choose button. If you change the title, #. change xset_text_dialog. -#: ../src/settings.c:9164 ../src/settings.c:11516 +#: ../src/settings.c:9167 ../src/settings.c:11519 msgid "Set Window Icon" msgstr "" -#: ../src/settings.c:9166 ../src/ptk/ptk-handler.c:3182 +#: ../src/settings.c:9169 ../src/ptk/ptk-handler.c:3182 #: ../src/item-prop.c:1683 ../src/item-prop.c:1734 msgid "C_hoose" msgstr "" -#: ../src/settings.c:9185 ../src/settings.c:9366 ../src/settings.c:12132 +#: ../src/settings.c:9188 ../src/settings.c:9369 ../src/settings.c:12135 msgid "_Default" msgstr "" -#: ../src/settings.c:9226 +#: ../src/settings.c:9229 msgid "Your input is invalid because it contains linefeeds" msgstr "" -#: ../src/settings.c:9369 +#: ../src/settings.c:9372 msgid "_OK" msgstr "" -#: ../src/settings.c:9506 +#: ../src/settings.c:9509 msgid "_Unset" msgstr "" -#: ../src/settings.c:10633 ../src/settings.c:10685 +#: ../src/settings.c:10636 ../src/settings.c:10688 #: ../src/ptk/ptk-location-view.c:3528 ../src/ptk/ptk-location-view.c:3944 msgid "_Unmount" msgstr "" -#: ../src/settings.c:10637 +#: ../src/settings.c:10640 msgid "Re_load" msgstr "" -#: ../src/settings.c:10641 +#: ../src/settings.c:10644 msgid "_Sync" msgstr "" @@ -3097,103 +3097,103 @@ #. set = xset_set( "book_tab", "lbl", C_("Bookmarks|Open|", "_Tab") ); #. xset_set_set( set, "icn", "gtk-add" ); #. -#: ../src/settings.c:10645 ../src/settings.c:11141 ../src/settings.c:11964 +#: ../src/settings.c:10648 ../src/settings.c:11144 ../src/settings.c:11967 #: ../src/find-files.c:278 msgid "_Open" msgstr "" -#: ../src/settings.c:10649 +#: ../src/settings.c:10652 msgctxt "Devices|Open|" msgid "Open In _Tab" msgstr "" -#: ../src/settings.c:10653 ../src/settings.c:10680 +#: ../src/settings.c:10656 ../src/settings.c:10683 #: ../src/ptk/ptk-location-view.c:3521 ../src/ptk/ptk-location-view.c:3938 msgid "_Mount" msgstr "" -#: ../src/settings.c:10657 +#: ../src/settings.c:10660 msgid "Re_/mount" msgstr "" -#: ../src/settings.c:10674 ../src/settings.c:12443 +#: ../src/settings.c:10677 ../src/settings.c:12446 msgid "_Root" msgstr "" -#: ../src/settings.c:10690 +#: ../src/settings.c:10693 msgid "_Label" msgstr "" -#: ../src/settings.c:10740 +#: ../src/settings.c:10743 msgid "_Check" msgstr "" -#: ../src/settings.c:10744 +#: ../src/settings.c:10747 msgid "_Edit fstab" msgstr "" -#: ../src/settings.c:10748 +#: ../src/settings.c:10751 msgid "Edit u_devil.conf" msgstr "" -#: ../src/settings.c:10752 +#: ../src/settings.c:10755 msgid "_Format" msgstr "" -#: ../src/settings.c:10812 +#: ../src/settings.c:10815 msgid "_Backup" msgstr "" -#: ../src/settings.c:10834 +#: ../src/settings.c:10837 msgid "_Restore" msgstr "" -#: ../src/settings.c:10839 +#: ../src/settings.c:10842 msgid "_From File" msgstr "" -#: ../src/settings.c:10844 ../src/settings.c:11260 +#: ../src/settings.c:10847 ../src/settings.c:11263 msgid "File _Info" msgstr "" -#: ../src/settings.c:10851 +#: ../src/settings.c:10854 msgid "Setti_ngs" msgstr "" #. dev settings -#: ../src/settings.c:10857 +#: ../src/settings.c:10860 msgid "S_how" msgstr "" -#: ../src/settings.c:10862 +#: ../src/settings.c:10865 msgid "_Internal Drives" msgstr "" -#: ../src/settings.c:10867 +#: ../src/settings.c:10870 msgid "_Empty Drives" msgstr "" -#: ../src/settings.c:10872 +#: ../src/settings.c:10875 msgid "_Partition Tables" msgstr "" -#: ../src/settings.c:10876 +#: ../src/settings.c:10879 msgid "Mounted _Networks" msgstr "" -#: ../src/settings.c:10881 +#: ../src/settings.c:10884 msgid "Mounted _Other" msgstr "" -#: ../src/settings.c:10886 +#: ../src/settings.c:10889 msgid "_Volumes..." msgstr "" -#: ../src/settings.c:10887 +#: ../src/settings.c:10890 msgid "Show/Hide Volumes" msgstr "" -#: ../src/settings.c:10888 +#: ../src/settings.c:10891 msgid "" "To force showing or hiding of some volumes, overriding other settings, you " "can specify the devices, volume labels, or device IDs in the space-separated " @@ -3208,15 +3208,15 @@ "\n" msgstr "" -#: ../src/settings.c:10895 +#: ../src/settings.c:10898 msgid "_Display Name" msgstr "" -#: ../src/settings.c:10897 +#: ../src/settings.c:10900 msgid "Set Display Name Format" msgstr "" -#: ../src/settings.c:10898 +#: ../src/settings.c:10901 #, c-format msgid "" "Enter device display name format:\n" @@ -3231,27 +3231,27 @@ "\t%%n\tmajor:minor device numbers (eg 15:3)\n" msgstr "" -#: ../src/settings.c:10904 +#: ../src/settings.c:10907 msgid "_Auto Mount" msgstr "" -#: ../src/settings.c:10909 +#: ../src/settings.c:10912 msgid "Mount _Optical" msgstr "" -#: ../src/settings.c:10914 +#: ../src/settings.c:10917 msgid "_Mount Removable" msgstr "" -#: ../src/settings.c:10919 +#: ../src/settings.c:10922 msgid "Mount _Volumes..." msgstr "" -#: ../src/settings.c:10920 +#: ../src/settings.c:10923 msgid "Auto-Mount Volumes" msgstr "" -#: ../src/settings.c:10921 +#: ../src/settings.c:10924 msgid "" "To force or prevent automounting of some volumes, overriding other settings, " "you can specify the devices, volume labels, or device IDs in the space-" @@ -3266,15 +3266,15 @@ "\n" msgstr "" -#: ../src/settings.c:10924 +#: ../src/settings.c:10927 msgid "Mount _Dirs..." msgstr "" -#: ../src/settings.c:10925 +#: ../src/settings.c:10928 msgid "Automatic Mount Point Dirs" msgstr "" -#: ../src/settings.c:10927 +#: ../src/settings.c:10930 #, c-format msgid "" "Enter the directory where SpaceFM should automatically create mount point " @@ -3287,27 +3287,27 @@ "\n" msgstr "" -#: ../src/settings.c:10930 +#: ../src/settings.c:10933 msgid "Open _Tab" msgstr "" -#: ../src/settings.c:10935 +#: ../src/settings.c:10938 msgid "_Unmount On Exit" msgstr "" -#: ../src/settings.c:10943 +#: ../src/settings.c:10946 msgid "Auto _Run" msgstr "" -#: ../src/settings.c:10949 +#: ../src/settings.c:10952 msgid "On _Mount" msgstr "" -#: ../src/settings.c:10951 +#: ../src/settings.c:10954 msgid "Auto Run On Mount" msgstr "" -#: ../src/settings.c:10952 +#: ../src/settings.c:10955 #, c-format msgid "" "Enter program or bash command line to be run automatically after a removable " @@ -3319,15 +3319,15 @@ "\t%%m\tdevice mount point (eg /media/disk)" msgstr "" -#: ../src/settings.c:10955 +#: ../src/settings.c:10958 msgid "On _Audio CD" msgstr "" -#: ../src/settings.c:10957 +#: ../src/settings.c:10960 msgid "Auto Run On Audio CD" msgstr "" -#: ../src/settings.c:10958 +#: ../src/settings.c:10961 #, c-format msgid "" "Enter program or bash command line to be run automatically when an audio CD " @@ -3339,15 +3339,15 @@ "\t%%m\tdevice mount point (eg /media/disk)" msgstr "" -#: ../src/settings.c:10961 +#: ../src/settings.c:10964 msgid "On _Video DVD" msgstr "" -#: ../src/settings.c:10963 +#: ../src/settings.c:10966 msgid "Auto Run On Video DVD" msgstr "" -#: ../src/settings.c:10964 +#: ../src/settings.c:10967 #, c-format msgid "" "Enter program or bash command line to be run automatically when a video DVD " @@ -3359,15 +3359,15 @@ "\t%%m\tdevice mount point (eg /media/disk)" msgstr "" -#: ../src/settings.c:10967 +#: ../src/settings.c:10970 msgid "On _Insert" msgstr "" -#: ../src/settings.c:10969 +#: ../src/settings.c:10972 msgid "Auto Run On Insert" msgstr "" -#: ../src/settings.c:10970 +#: ../src/settings.c:10973 #, c-format msgid "" "Enter program or bash command line to be run automatically when any device " @@ -3379,15 +3379,15 @@ "\t%%m\tdevice mount point (eg /media/disk)" msgstr "" -#: ../src/settings.c:10973 +#: ../src/settings.c:10976 msgid "On _Unmount" msgstr "" -#: ../src/settings.c:10975 +#: ../src/settings.c:10978 msgid "Auto Run On Unmount" msgstr "" -#: ../src/settings.c:10976 +#: ../src/settings.c:10979 #, c-format msgid "" "Enter program or bash command line to be run automatically when any device " @@ -3399,15 +3399,15 @@ "\t%%m\tdevice mount point (eg /media/disk)" msgstr "" -#: ../src/settings.c:10979 +#: ../src/settings.c:10982 msgid "On _Remove" msgstr "" -#: ../src/settings.c:10981 +#: ../src/settings.c:10984 msgid "Auto Run On Remove" msgstr "" -#: ../src/settings.c:10982 +#: ../src/settings.c:10985 #, c-format msgid "" "Enter program or bash command line to be run automatically when any device " @@ -3419,11 +3419,11 @@ "\t%%m\tdevice mount point (eg /media/disk)" msgstr "" -#: ../src/settings.c:10989 +#: ../src/settings.c:10992 msgid "_Mount Options" msgstr "" -#: ../src/settings.c:10990 +#: ../src/settings.c:10993 #, c-format msgid "" "Enter your comma- or space-separated list of default mount options below " @@ -3442,15 +3442,15 @@ "some handlers may ignore options set here." msgstr "" -#: ../src/settings.c:10992 +#: ../src/settings.c:10995 msgid "Default Mount Options" msgstr "" -#: ../src/settings.c:11000 +#: ../src/settings.c:11003 msgid "Re/mount With Options" msgstr "" -#: ../src/settings.c:11001 +#: ../src/settings.c:11004 msgid "" "Device will be (re)mounted using the options below.\n" "\n" @@ -3467,11 +3467,11 @@ "ignores options set here." msgstr "" -#: ../src/settings.c:11005 +#: ../src/settings.c:11008 msgid "_Change Detection" msgstr "" -#: ../src/settings.c:11006 +#: ../src/settings.c:11009 msgid "" "Enter your comma- or space-separated list of filesystems which should NOT be " "monitored for changes. This setting only affects non-block devices (such as " @@ -3479,7 +3479,7 @@ "with network filesystems. Loading of thumbnails will also be disabled." msgstr "" -#: ../src/settings.c:11008 +#: ../src/settings.c:11011 msgid "Change Detection Blacklist" msgstr "" @@ -3498,197 +3498,197 @@ #. xset_set_set( set, "icn", "gtk-edit" ); #. set->line = g_strdup( "#devices-settings-ucmd" ); #. -#: ../src/settings.c:11030 +#: ../src/settings.c:11033 msgid "_Device Handlers" msgstr "" -#: ../src/settings.c:11034 ../src/settings.c:12243 +#: ../src/settings.c:11037 ../src/settings.c:12246 msgid "_Protocol Handlers" msgstr "" -#: ../src/settings.c:11051 ../src/settings.c:12600 ../src/settings.c:12612 +#: ../src/settings.c:11054 ../src/settings.c:12603 ../src/settings.c:12615 msgid "_Icon" msgstr "" -#: ../src/settings.c:11056 +#: ../src/settings.c:11059 msgid "Audio CD" msgstr "" -#: ../src/settings.c:11062 +#: ../src/settings.c:11065 msgid "Optical Mounted" msgstr "" -#: ../src/settings.c:11067 +#: ../src/settings.c:11070 msgid "Optical Has Media" msgstr "" -#: ../src/settings.c:11072 +#: ../src/settings.c:11075 msgid "Optical No Media" msgstr "" -#: ../src/settings.c:11077 +#: ../src/settings.c:11080 msgid "Floppy Mounted" msgstr "" -#: ../src/settings.c:11082 +#: ../src/settings.c:11085 msgid "Floppy Unmounted" msgstr "" -#: ../src/settings.c:11087 +#: ../src/settings.c:11090 msgid "Removable Mounted" msgstr "" -#: ../src/settings.c:11092 +#: ../src/settings.c:11095 msgid "Removable Unmounted" msgstr "" -#: ../src/settings.c:11097 +#: ../src/settings.c:11100 msgid "Internal Mounted" msgstr "" -#: ../src/settings.c:11102 +#: ../src/settings.c:11105 msgid "Internal Unmounted" msgstr "" -#: ../src/settings.c:11107 +#: ../src/settings.c:11110 msgid "Mounted Network" msgstr "" -#: ../src/settings.c:11112 +#: ../src/settings.c:11115 msgid "Mounted Other" msgstr "" -#: ../src/settings.c:11145 +#: ../src/settings.c:11148 msgid "_Settings" msgstr "" -#: ../src/settings.c:11150 +#: ../src/settings.c:11153 msgid "Bookmark _Icon" msgstr "" -#: ../src/settings.c:11155 +#: ../src/settings.c:11158 msgid "Sub_menu Icon" msgstr "" -#: ../src/settings.c:11160 +#: ../src/settings.c:11163 msgid "_Show Bookmarks" msgstr "" -#: ../src/settings.c:11165 +#: ../src/settings.c:11168 msgid "New _Bookmark" msgstr "" #. Rename/Move Dialog -#: ../src/settings.c:11175 ../src/settings.c:12203 ../src/settings.c:12618 +#: ../src/settings.c:11178 ../src/settings.c:12206 ../src/settings.c:12621 msgid "_Name" msgstr "" -#: ../src/settings.c:11182 +#: ../src/settings.c:11185 msgid "_Parent" msgstr "" -#: ../src/settings.c:11185 ../src/ptk/ptk-file-misc.c:1075 +#: ../src/settings.c:11188 ../src/ptk/ptk-file-misc.c:1075 msgid "P_ath" msgstr "" -#: ../src/settings.c:11201 +#: ../src/settings.c:11204 msgid "_Option" msgstr "" -#: ../src/settings.c:11209 ../src/settings.c:12093 +#: ../src/settings.c:11212 ../src/settings.c:12096 #: ../src/ptk/ptk-file-misc.c:1256 ../src/ptk/ptk-file-misc.c:1267 msgid "_Link" msgstr "" -#: ../src/settings.c:11213 ../src/ptk/ptk-file-misc.c:2506 +#: ../src/settings.c:11216 ../src/ptk/ptk-file-misc.c:2506 msgid "Copy _Target" msgstr "" -#: ../src/settings.c:11216 +#: ../src/settings.c:11219 msgid "Lin_k Target" msgstr "" -#: ../src/settings.c:11219 +#: ../src/settings.c:11222 msgid "_As Root" msgstr "" -#: ../src/settings.c:11223 ../src/settings.c:11779 ../src/settings.c:11831 -#: ../src/settings.c:11929 ../src/settings.c:11958 ../src/settings.c:12567 -#: ../src/settings.c:12573 ../src/settings.c:12580 ../src/settings.c:12587 -#: ../src/settings.c:12594 ../src/settings.c:12604 +#: ../src/settings.c:11226 ../src/settings.c:11782 ../src/settings.c:11834 +#: ../src/settings.c:11932 ../src/settings.c:11961 ../src/settings.c:12570 +#: ../src/settings.c:12576 ../src/settings.c:12583 ../src/settings.c:12590 +#: ../src/settings.c:12597 ../src/settings.c:12607 msgid "_Font" msgstr "" -#: ../src/settings.c:11226 +#: ../src/settings.c:11229 msgid "Move Dialog Font" msgstr "" -#: ../src/settings.c:11227 +#: ../src/settings.c:11230 msgid "/home/user/Example Filename.ext" msgstr "" -#: ../src/settings.c:11232 +#: ../src/settings.c:11235 msgid "_Confirm Create" msgstr "" -#: ../src/settings.c:11240 +#: ../src/settings.c:11243 msgid "Highlight _Bar" msgstr "" -#: ../src/settings.c:11241 +#: ../src/settings.c:11244 msgid "Status Bar Highlight Color" msgstr "" -#: ../src/settings.c:11245 +#: ../src/settings.c:11248 msgid "Highlight _Text" msgstr "" -#: ../src/settings.c:11246 +#: ../src/settings.c:11249 msgid "Status Bar Text Highlight Color" msgstr "" -#: ../src/settings.c:11250 +#: ../src/settings.c:11253 msgid "_Middle Click" msgstr "" -#: ../src/settings.c:11254 ../src/settings.c:12283 +#: ../src/settings.c:11257 ../src/settings.c:12286 msgid "Copy _Name" msgstr "" -#: ../src/settings.c:11257 ../src/settings.c:12286 +#: ../src/settings.c:11260 ../src/settings.c:12289 msgid "Copy _Path" msgstr "" -#: ../src/settings.c:11264 +#: ../src/settings.c:11267 msgid "_Hide Panel" msgstr "" -#: ../src/settings.c:11280 +#: ../src/settings.c:11283 msgid "New _Window" msgstr "" -#: ../src/settings.c:11283 +#: ../src/settings.c:11286 msgid "R_oot Window" msgstr "" -#: ../src/settings.c:11286 +#: ../src/settings.c:11289 msgid "_File Search" msgstr "" -#: ../src/settings.c:11289 +#: ../src/settings.c:11292 msgid "_Terminal" msgstr "" #. discovery notification -#: ../src/settings.c:11292 +#: ../src/settings.c:11295 msgid "_Root Terminal" msgstr "" -#: ../src/settings.c:11299 +#: ../src/settings.c:11302 msgid "Open URL" msgstr "" -#: ../src/settings.c:11300 +#: ../src/settings.c:11303 msgid "" "Enter URL in the format:\n" "\tPROTOCOL://USERNAME:PASSWORD@HOST:PORT/SHARE\n" @@ -3702,51 +3702,51 @@ "mounted network in Devices and select Bookmark.\n" msgstr "" -#: ../src/settings.c:11303 +#: ../src/settings.c:11306 msgid "Save Ta_bs" msgstr "" -#: ../src/settings.c:11307 +#: ../src/settings.c:11310 msgid "E_xit" msgstr "" -#: ../src/settings.c:11338 ../src/settings.c:11376 ../src/settings.c:12010 -#: ../src/settings.c:12335 ../src/settings.c:12373 +#: ../src/settings.c:11341 ../src/settings.c:11379 ../src/settings.c:12013 +#: ../src/settings.c:12338 ../src/settings.c:12376 msgid "Panel _1" msgstr "" -#: ../src/settings.c:11343 ../src/settings.c:11378 ../src/settings.c:12011 -#: ../src/settings.c:12336 ../src/settings.c:12374 +#: ../src/settings.c:11346 ../src/settings.c:11381 ../src/settings.c:12014 +#: ../src/settings.c:12339 ../src/settings.c:12377 msgid "Panel _2" msgstr "" -#: ../src/settings.c:11347 ../src/settings.c:11379 ../src/settings.c:12012 -#: ../src/settings.c:12337 ../src/settings.c:12375 +#: ../src/settings.c:11350 ../src/settings.c:11382 ../src/settings.c:12015 +#: ../src/settings.c:12340 ../src/settings.c:12378 msgid "Panel _3" msgstr "" -#: ../src/settings.c:11351 ../src/settings.c:11380 ../src/settings.c:12013 -#: ../src/settings.c:12338 ../src/settings.c:12376 +#: ../src/settings.c:11354 ../src/settings.c:11383 ../src/settings.c:12016 +#: ../src/settings.c:12341 ../src/settings.c:12379 msgid "Panel _4" msgstr "" -#: ../src/settings.c:11355 +#: ../src/settings.c:11358 msgid "Panel _Bar" msgstr "" -#: ../src/settings.c:11360 +#: ../src/settings.c:11363 msgid "F_ocus" msgstr "" -#: ../src/settings.c:11366 ../src/settings.c:11991 ../src/settings.c:12008 -#: ../src/settings.c:12159 ../src/settings.c:12316 ../src/settings.c:12333 -#: ../src/settings.c:12354 ../src/settings.c:12371 +#: ../src/settings.c:11369 ../src/settings.c:11994 ../src/settings.c:12011 +#: ../src/settings.c:12162 ../src/settings.c:12319 ../src/settings.c:12336 +#: ../src/settings.c:12357 ../src/settings.c:12374 msgid "_Prev" msgstr "" -#: ../src/settings.c:11368 ../src/settings.c:11992 ../src/settings.c:12009 -#: ../src/settings.c:12160 ../src/settings.c:12317 ../src/settings.c:12334 -#: ../src/settings.c:12355 ../src/settings.c:12372 +#: ../src/settings.c:11371 ../src/settings.c:11995 ../src/settings.c:12012 +#: ../src/settings.c:12163 ../src/settings.c:12320 ../src/settings.c:12337 +#: ../src/settings.c:12358 ../src/settings.c:12375 msgid "_Next" msgstr "" @@ -3756,27 +3756,27 @@ #. xset_set( "panel_top", "lbl", _("_Top") ); #. xset_set( "panel_bottom", "lbl", _("_Bottom") ); #. -#: ../src/settings.c:11375 ../src/settings.c:12378 +#: ../src/settings.c:11378 ../src/settings.c:12381 msgid "_Hide" msgstr "" -#: ../src/settings.c:11382 +#: ../src/settings.c:11385 msgid "_Event Manager" msgstr "" -#: ../src/settings.c:11388 +#: ../src/settings.c:11391 msgid "_Instance" msgstr "" -#: ../src/settings.c:11393 +#: ../src/settings.c:11396 msgid "_Startup" msgstr "" -#: ../src/settings.c:11395 +#: ../src/settings.c:11398 msgid "Set Instance Startup Command" msgstr "" -#: ../src/settings.c:11396 +#: ../src/settings.c:11399 #, c-format msgid "" "Enter program or bash command line to be run automatically when a SpaceFM " @@ -3786,15 +3786,15 @@ "\t%%e\tevent type (evt_start)\n" msgstr "" -#: ../src/settings.c:11399 +#: ../src/settings.c:11402 msgid "_Exit" msgstr "" -#: ../src/settings.c:11401 +#: ../src/settings.c:11404 msgid "Set Instance Exit Command" msgstr "" -#: ../src/settings.c:11402 +#: ../src/settings.c:11405 #, c-format msgid "" "Enter program or bash command line to be run automatically when a SpaceFM " @@ -3804,20 +3804,20 @@ "\t%%e\tevent type (evt_exit)\n" msgstr "" -#: ../src/settings.c:11405 +#: ../src/settings.c:11408 msgid "_Window" msgstr "" -#: ../src/settings.c:11410 +#: ../src/settings.c:11413 msgctxt "View|Events|Window|" msgid "_New" msgstr "" -#: ../src/settings.c:11412 +#: ../src/settings.c:11415 msgid "Set New Window Command" msgstr "" -#: ../src/settings.c:11413 +#: ../src/settings.c:11416 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a new " @@ -3832,15 +3832,16 @@ "Exported bash variables (eg $fm_pwd, etc) can be used in this command." msgstr "" -#: ../src/settings.c:11416 ../src/settings.c:11451 ../src/settings.c:11486 +#: ../src/settings.c:11419 +msgctxt "View|Events|Window|" msgid "_Focus" msgstr "" -#: ../src/settings.c:11418 +#: ../src/settings.c:11421 msgid "Set Window Focus Command" msgstr "" -#: ../src/settings.c:11419 +#: ../src/settings.c:11422 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a " @@ -3855,15 +3856,15 @@ "Exported bash variables (eg $fm_pwd, etc) can be used in this command." msgstr "" -#: ../src/settings.c:11422 +#: ../src/settings.c:11425 msgid "_Move/Resize" msgstr "" -#: ../src/settings.c:11424 +#: ../src/settings.c:11427 msgid "Set Window Move/Resize Command" msgstr "" -#: ../src/settings.c:11425 +#: ../src/settings.c:11428 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a " @@ -3880,15 +3881,16 @@ "Note: This command may be run multiple times during resize." msgstr "" -#: ../src/settings.c:11428 +#: ../src/settings.c:11431 +msgctxt "View|Events|Window|" msgid "_Click" msgstr "" -#: ../src/settings.c:11430 +#: ../src/settings.c:11433 msgid "Set Click Command" msgstr "" -#: ../src/settings.c:11431 +#: ../src/settings.c:11434 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever the " @@ -3912,15 +3914,15 @@ "button was clicked in %%f\" --button ok &" msgstr "" -#: ../src/settings.c:11434 +#: ../src/settings.c:11437 msgid "_Keypress" msgstr "" -#: ../src/settings.c:11436 +#: ../src/settings.c:11439 msgid "Set Window Keypress Command" msgstr "" -#: ../src/settings.c:11437 +#: ../src/settings.c:11440 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a key is " @@ -3943,15 +3945,16 @@ "F8 was pressed.\" --button ok &" msgstr "" -#: ../src/settings.c:11440 +#: ../src/settings.c:11443 +msgctxt "View|Events|Window|" msgid "Cl_ose" msgstr "" -#: ../src/settings.c:11442 +#: ../src/settings.c:11445 msgid "Set Window Close Command" msgstr "" -#: ../src/settings.c:11443 +#: ../src/settings.c:11446 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a " @@ -3966,15 +3969,20 @@ "Exported bash variables (eg $fm_pwd, etc) can be used in this command." msgstr "" -#: ../src/settings.c:11446 +#: ../src/settings.c:11449 msgid "_Panel" msgstr "" -#: ../src/settings.c:11453 +#: ../src/settings.c:11454 +msgctxt "View|Events|Panel|" +msgid "_Focus" +msgstr "" + +#: ../src/settings.c:11456 msgid "Set Panel Focus Command" msgstr "" -#: ../src/settings.c:11454 +#: ../src/settings.c:11457 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a panel " @@ -3989,16 +3997,16 @@ "Exported bash variables (eg $fm_pwd, etc) can be used in this command." msgstr "" -#: ../src/settings.c:11457 +#: ../src/settings.c:11460 msgctxt "View|Events|Panel|" msgid "_Show" msgstr "" -#: ../src/settings.c:11459 +#: ../src/settings.c:11462 msgid "Set Panel Show Command" msgstr "" -#: ../src/settings.c:11460 +#: ../src/settings.c:11463 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a panel " @@ -4015,15 +4023,15 @@ "Exported bash variables (eg $fm_pwd, etc) can be used in this command." msgstr "" -#: ../src/settings.c:11463 +#: ../src/settings.c:11466 msgid "S_elect" msgstr "" -#: ../src/settings.c:11465 +#: ../src/settings.c:11468 msgid "Set Panel Select Command" msgstr "" -#: ../src/settings.c:11466 +#: ../src/settings.c:11469 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever the file " @@ -4041,16 +4049,21 @@ "status 0 to inhibit the default handler." msgstr "" -#: ../src/settings.c:11469 +#: ../src/settings.c:11472 msgctxt "View|Events|" msgid "_Tab" msgstr "" -#: ../src/settings.c:11476 +#: ../src/settings.c:11477 +msgctxt "View|Events|Tab|" +msgid "_New" +msgstr "" + +#: ../src/settings.c:11479 msgid "Set New Tab Command" msgstr "" -#: ../src/settings.c:11477 +#: ../src/settings.c:11480 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a new " @@ -4065,15 +4078,15 @@ "Exported bash variables (eg $fm_pwd, etc) can be used in this command." msgstr "" -#: ../src/settings.c:11480 +#: ../src/settings.c:11483 msgid "_Change Dir" msgstr "" -#: ../src/settings.c:11482 +#: ../src/settings.c:11485 msgid "Set Tab Change Dir Command" msgstr "" -#: ../src/settings.c:11483 +#: ../src/settings.c:11486 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a tab " @@ -4089,11 +4102,16 @@ "Exported bash variables (eg $fm_pwd, etc) can be used in this command." msgstr "" -#: ../src/settings.c:11488 +#: ../src/settings.c:11489 +msgctxt "View|Events|Tab|" +msgid "_Focus" +msgstr "" + +#: ../src/settings.c:11491 msgid "Set Tab Focus Command" msgstr "" -#: ../src/settings.c:11489 +#: ../src/settings.c:11492 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a tab " @@ -4108,16 +4126,16 @@ "Exported bash variables (eg $fm_pwd, etc) can be used in this command." msgstr "" -#: ../src/settings.c:11492 +#: ../src/settings.c:11495 msgctxt "View|Events|Tab|" msgid "_Close" msgstr "" -#: ../src/settings.c:11494 +#: ../src/settings.c:11497 msgid "Set Tab Close Command" msgstr "" -#: ../src/settings.c:11495 +#: ../src/settings.c:11498 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a tab is " @@ -4130,15 +4148,16 @@ "\t%%t\tclosed tab" msgstr "" -#: ../src/settings.c:11498 +#: ../src/settings.c:11501 +msgctxt "View|Events|" msgid "_Device" msgstr "" -#: ../src/settings.c:11500 +#: ../src/settings.c:11503 msgid "Set Device Command" msgstr "" -#: ../src/settings.c:11501 +#: ../src/settings.c:11504 #, c-format msgid "" "Enter program or bash command line to be run automatically whenever a device " @@ -4150,15 +4169,15 @@ "\t%%v\tchange (added|removed|changed)\n" msgstr "" -#: ../src/settings.c:11504 +#: ../src/settings.c:11507 msgid "Wi_ndow Title" msgstr "" -#: ../src/settings.c:11506 +#: ../src/settings.c:11509 msgid "Set Window Title Format" msgstr "" -#: ../src/settings.c:11507 +#: ../src/settings.c:11510 #, c-format msgid "" "Set window title format:\n" @@ -4173,11 +4192,11 @@ "\t*\tasterisk shown if tasks running in window" msgstr "" -#: ../src/settings.c:11511 +#: ../src/settings.c:11514 msgid "_Window Icon" msgstr "" -#: ../src/settings.c:11517 +#: ../src/settings.c:11520 msgid "" "Enter an icon name, icon file path, or stock item name:\n" "\n" @@ -4192,68 +4211,68 @@ msgstr "" #. x and y store global icon chooser dialog size -#: ../src/settings.c:11520 +#: ../src/settings.c:11523 msgid "_Fullscreen" msgstr "" -#: ../src/settings.c:11523 +#: ../src/settings.c:11526 msgid "_Design Mode" msgstr "" -#: ../src/settings.c:11526 +#: ../src/settings.c:11529 msgid "_Preferences" msgstr "" -#: ../src/settings.c:11529 +#: ../src/settings.c:11532 msgid "_Tool" msgstr "" -#: ../src/settings.c:11535 +#: ../src/settings.c:11538 msgid "_Thumbnails (global)" msgstr "" #. Plugins -#: ../src/settings.c:11539 +#: ../src/settings.c:11542 msgid "_Install" msgstr "" -#: ../src/settings.c:11567 +#: ../src/settings.c:11570 msgid "_Verbose" msgstr "" -#: ../src/settings.c:11574 +#: ../src/settings.c:11577 msgid "In_cluded" msgstr "" -#: ../src/settings.c:11588 +#: ../src/settings.c:11591 msgid "_User's Manual" msgstr "" -#: ../src/settings.c:11594 +#: ../src/settings.c:11597 msgid "_Homepage" msgstr "" -#: ../src/settings.c:11597 +#: ../src/settings.c:11600 msgid "SpaceFM _News" msgstr "" -#: ../src/settings.c:11600 +#: ../src/settings.c:11603 msgid "_Get Plugins" msgstr "" -#: ../src/settings.c:11603 +#: ../src/settings.c:11606 msgid "_Options" msgstr "" -#: ../src/settings.c:11608 +#: ../src/settings.c:11611 msgid "_Browser" msgstr "" -#: ../src/settings.c:11610 +#: ../src/settings.c:11613 msgid "Choose HTML Browser" msgstr "" -#: ../src/settings.c:11611 +#: ../src/settings.c:11614 #, c-format msgid "" "Enter browser name or bash command line to be used to display HTML files and " @@ -4265,701 +4284,701 @@ "(Leave blank for automatic browser detection)" msgstr "" -#: ../src/settings.c:11614 +#: ../src/settings.c:11617 msgid "_Manual Location" msgstr "" -#: ../src/settings.c:11616 +#: ../src/settings.c:11619 msgid "Choose User's Manual Location" msgstr "" -#: ../src/settings.c:11617 +#: ../src/settings.c:11620 msgid "" "Enter local file path or remote URL for the SpaceFM User's Manual:\n" "\n" "(Leave blank for default)\n" msgstr "" -#: ../src/settings.c:11620 +#: ../src/settings.c:11623 msgid "_About" msgstr "" -#: ../src/settings.c:11623 +#: ../src/settings.c:11626 msgid "_Show Devices" msgstr "" -#: ../src/settings.c:11653 +#: ../src/settings.c:11656 msgid "_Status" msgstr "" #. column position #. column width -#: ../src/settings.c:11659 +#: ../src/settings.c:11662 msgid "_Count" msgstr "" -#: ../src/settings.c:11670 +#: ../src/settings.c:11673 msgid "_Item" msgstr "" -#: ../src/settings.c:11676 +#: ../src/settings.c:11679 msgid "_To" msgstr "" -#: ../src/settings.c:11682 +#: ../src/settings.c:11685 msgid "_Progress" msgstr "" -#: ../src/settings.c:11689 +#: ../src/settings.c:11692 msgid "T_otal" msgstr "" -#: ../src/settings.c:11696 +#: ../src/settings.c:11699 msgid "Sta_rted" msgstr "" -#: ../src/settings.c:11701 +#: ../src/settings.c:11704 msgid "_Elapsed" msgstr "" -#: ../src/settings.c:11708 +#: ../src/settings.c:11711 msgid "C_urrent Speed" msgstr "" -#: ../src/settings.c:11720 +#: ../src/settings.c:11723 msgid "_Average Speed" msgstr "" -#: ../src/settings.c:11732 +#: ../src/settings.c:11735 msgid "Reor_der" msgstr "" -#: ../src/settings.c:11738 ../src/settings.c:11758 +#: ../src/settings.c:11741 ../src/settings.c:11761 #: ../src/ptk/ptk-file-task.c:553 ../src/ptk/ptk-file-task.c:838 msgid "Pa_use" msgstr "" -#: ../src/settings.c:11741 ../src/settings.c:11761 +#: ../src/settings.c:11744 ../src/settings.c:11764 msgid "_Queue" msgstr "" -#: ../src/settings.c:11744 ../src/settings.c:11764 +#: ../src/settings.c:11747 ../src/settings.c:11767 msgid "_Resume" msgstr "" -#: ../src/settings.c:11747 +#: ../src/settings.c:11750 msgid "Sho_w Output" msgstr "" -#: ../src/settings.c:11750 +#: ../src/settings.c:11753 msgid "_All Tasks" msgstr "" -#: ../src/settings.c:11782 +#: ../src/settings.c:11785 msgid "Task Manager Font" msgstr "" -#: ../src/settings.c:11783 +#: ../src/settings.c:11786 msgid "copying File 1:15 65.2 M 30.2 M/s" msgstr "" -#: ../src/settings.c:11786 +#: ../src/settings.c:11789 msgid "_Columns" msgstr "" -#: ../src/settings.c:11791 +#: ../src/settings.c:11794 msgid "_Popups" msgstr "" -#: ../src/settings.c:11796 +#: ../src/settings.c:11799 msgid "Popup _All Tasks" msgstr "" -#: ../src/settings.c:11801 +#: ../src/settings.c:11804 msgid "Stay On _Top" msgstr "" -#: ../src/settings.c:11806 +#: ../src/settings.c:11809 msgid "A_bove Others" msgstr "" -#: ../src/settings.c:11811 +#: ../src/settings.c:11814 msgid "All _Workspaces" msgstr "" -#: ../src/settings.c:11821 +#: ../src/settings.c:11824 msgid "_Overwrite Option" msgstr "" -#: ../src/settings.c:11826 +#: ../src/settings.c:11829 msgid "_Error Option" msgstr "" -#: ../src/settings.c:11834 +#: ../src/settings.c:11837 msgid "Task Popup Font (affects new tasks)" msgstr "" -#: ../src/settings.c:11835 +#: ../src/settings.c:11838 msgid "Example Output 0123456789" msgstr "" -#: ../src/settings.c:11844 +#: ../src/settings.c:11847 msgid "Stop If _First" msgstr "" -#: ../src/settings.c:11849 +#: ../src/settings.c:11852 msgid "Stop On _Any" msgstr "" -#: ../src/settings.c:11854 +#: ../src/settings.c:11857 msgid "_Continue" msgstr "" -#: ../src/settings.c:11859 +#: ../src/settings.c:11862 msgid "Qu_eue" msgstr "" -#: ../src/settings.c:11864 +#: ../src/settings.c:11867 msgid "_Queue New Tasks" msgstr "" -#: ../src/settings.c:11869 +#: ../src/settings.c:11872 msgid "_Smart Queue" msgstr "" -#: ../src/settings.c:11874 +#: ../src/settings.c:11877 msgid "_Pause On Error" msgstr "" -#: ../src/settings.c:11884 +#: ../src/settings.c:11887 msgid "Arrange _Icons" msgstr "" -#: ../src/settings.c:11889 +#: ../src/settings.c:11892 msgid "By _Name" msgstr "" -#: ../src/settings.c:11892 +#: ../src/settings.c:11895 msgid "By _Type" msgstr "" -#: ../src/settings.c:11895 +#: ../src/settings.c:11898 msgid "By _Date" msgstr "" -#: ../src/settings.c:11898 +#: ../src/settings.c:11901 msgid "By _Size" msgstr "" -#: ../src/settings.c:11901 +#: ../src/settings.c:11904 msgid "_Custom" msgstr "" -#: ../src/settings.c:11904 ../src/settings.c:12215 +#: ../src/settings.c:11907 ../src/settings.c:12218 msgid "_Ascending" msgstr "" -#: ../src/settings.c:11907 +#: ../src/settings.c:11910 msgid "D_escending" msgstr "" -#: ../src/settings.c:11910 +#: ../src/settings.c:11913 msgid "Desktop _Settings" msgstr "" #. set->b keeps desktop prefs compositing wm info has been shown -#: ../src/settings.c:11914 ../src/settings.c:12152 +#: ../src/settings.c:11917 ../src/settings.c:12155 msgid "De_vices" msgstr "" -#: ../src/settings.c:11922 +#: ../src/settings.c:11925 msgid "_Desktop Folder" msgstr "" -#: ../src/settings.c:11932 +#: ../src/settings.c:11935 msgid "Editor Font" msgstr "" -#: ../src/settings.c:11933 ../src/settings.c:11962 +#: ../src/settings.c:11936 ../src/settings.c:11965 msgid "Example Input 0123456789" msgstr "" -#: ../src/settings.c:11961 +#: ../src/settings.c:11964 msgid "Input Font" msgstr "" -#: ../src/settings.c:11968 +#: ../src/settings.c:11971 msgid "E_xecute" msgstr "" -#: ../src/settings.c:11971 +#: ../src/settings.c:11974 msgid "Edi_t" msgstr "" -#: ../src/settings.c:11974 +#: ../src/settings.c:11977 msgid "Edit As _Root" msgstr "" -#: ../src/settings.c:11977 +#: ../src/settings.c:11980 msgid "_Choose..." msgstr "" -#: ../src/settings.c:11980 +#: ../src/settings.c:11983 msgid "File _Handlers..." msgstr "" -#: ../src/settings.c:11984 +#: ../src/settings.c:11987 msgid "Open With _Default" msgstr "" #. virtual -#: ../src/settings.c:11986 +#: ../src/settings.c:11989 msgid "In _Tab" msgstr "" -#: ../src/settings.c:11990 +#: ../src/settings.c:11993 msgid "N_ew" msgstr "" -#: ../src/settings.c:11993 ../src/settings.c:12163 ../src/settings.c:12318 -#: ../src/settings.c:12356 +#: ../src/settings.c:11996 ../src/settings.c:12166 ../src/settings.c:12321 +#: ../src/settings.c:12359 msgid "Tab _1" msgstr "" -#: ../src/settings.c:11994 ../src/settings.c:12164 ../src/settings.c:12319 -#: ../src/settings.c:12357 +#: ../src/settings.c:11997 ../src/settings.c:12167 ../src/settings.c:12322 +#: ../src/settings.c:12360 msgid "Tab _2" msgstr "" -#: ../src/settings.c:11995 ../src/settings.c:12165 ../src/settings.c:12320 -#: ../src/settings.c:12358 +#: ../src/settings.c:11998 ../src/settings.c:12168 ../src/settings.c:12323 +#: ../src/settings.c:12361 msgid "Tab _3" msgstr "" -#: ../src/settings.c:11996 ../src/settings.c:12166 ../src/settings.c:12321 -#: ../src/settings.c:12359 +#: ../src/settings.c:11999 ../src/settings.c:12169 ../src/settings.c:12324 +#: ../src/settings.c:12362 msgid "Tab _4" msgstr "" -#: ../src/settings.c:11997 ../src/settings.c:12167 ../src/settings.c:12322 -#: ../src/settings.c:12360 +#: ../src/settings.c:12000 ../src/settings.c:12170 ../src/settings.c:12325 +#: ../src/settings.c:12363 msgid "Tab _5" msgstr "" -#: ../src/settings.c:11998 ../src/settings.c:12168 ../src/settings.c:12323 -#: ../src/settings.c:12361 +#: ../src/settings.c:12001 ../src/settings.c:12171 ../src/settings.c:12326 +#: ../src/settings.c:12364 msgid "Tab _6" msgstr "" -#: ../src/settings.c:11999 ../src/settings.c:12169 ../src/settings.c:12324 -#: ../src/settings.c:12362 +#: ../src/settings.c:12002 ../src/settings.c:12172 ../src/settings.c:12327 +#: ../src/settings.c:12365 msgid "Tab _7" msgstr "" -#: ../src/settings.c:12000 ../src/settings.c:12170 ../src/settings.c:12325 -#: ../src/settings.c:12363 +#: ../src/settings.c:12003 ../src/settings.c:12173 ../src/settings.c:12328 +#: ../src/settings.c:12366 msgid "Tab _8" msgstr "" -#: ../src/settings.c:12001 ../src/settings.c:12171 ../src/settings.c:12326 -#: ../src/settings.c:12364 +#: ../src/settings.c:12004 ../src/settings.c:12174 ../src/settings.c:12329 +#: ../src/settings.c:12367 msgid "Tab _9" msgstr "" -#: ../src/settings.c:12002 ../src/settings.c:12172 ../src/settings.c:12327 -#: ../src/settings.c:12365 +#: ../src/settings.c:12005 ../src/settings.c:12175 ../src/settings.c:12330 +#: ../src/settings.c:12368 msgid "Tab 1_0" msgstr "" -#: ../src/settings.c:12004 +#: ../src/settings.c:12007 msgid "In _Panel" msgstr "" -#: ../src/settings.c:12015 ../src/settings.c:12042 +#: ../src/settings.c:12018 ../src/settings.c:12045 msgid "_Extract" msgstr "" -#: ../src/settings.c:12019 ../src/settings.c:12047 +#: ../src/settings.c:12022 ../src/settings.c:12050 msgid "Extract _To" msgstr "" -#: ../src/settings.c:12023 ../src/settings.c:12051 +#: ../src/settings.c:12026 ../src/settings.c:12054 msgid "_List Contents" msgstr "" -#: ../src/settings.c:12033 +#: ../src/settings.c:12036 msgid "_Archive Defaults" msgstr "" -#: ../src/settings.c:12038 +#: ../src/settings.c:12041 msgid "_Open With App" msgstr "" -#: ../src/settings.c:12055 +#: ../src/settings.c:12058 msgid "_Create Subfolder" msgstr "" -#: ../src/settings.c:12060 +#: ../src/settings.c:12063 msgid "_Write Access" msgstr "" -#: ../src/settings.c:12065 +#: ../src/settings.c:12068 msgid "Archive _Handlers" msgstr "" -#: ../src/settings.c:12089 +#: ../src/settings.c:12092 msgid "Fol_der" msgstr "" -#: ../src/settings.c:12097 +#: ../src/settings.c:12100 msgctxt "New|" msgid "_Bookmark" msgstr "" -#: ../src/settings.c:12101 +#: ../src/settings.c:12104 msgid "_Archive" msgstr "" #. Extract To - Create Subfolder #. Extract To - Write Access -#: ../src/settings.c:12108 +#: ../src/settings.c:12111 msgctxt "New|" msgid "_Tab" msgstr "" -#: ../src/settings.c:12110 +#: ../src/settings.c:12113 msgid "Tab _Here" msgstr "" -#: ../src/settings.c:12113 +#: ../src/settings.c:12116 msgid "_Desktop Application" msgstr "" -#: ../src/settings.c:12119 +#: ../src/settings.c:12122 msgid "_Go" msgstr "" -#: ../src/settings.c:12124 +#: ../src/settings.c:12127 msgid "_Back" msgstr "" -#: ../src/settings.c:12126 +#: ../src/settings.c:12129 msgid "_Forward" msgstr "" -#: ../src/settings.c:12128 +#: ../src/settings.c:12131 msgid "_Up" msgstr "" -#: ../src/settings.c:12130 +#: ../src/settings.c:12133 msgid "_Home" msgstr "" -#: ../src/settings.c:12135 +#: ../src/settings.c:12138 msgid "_Set Default" msgstr "" -#: ../src/settings.c:12138 +#: ../src/settings.c:12141 msgid "Re_al Path" msgstr "" -#: ../src/settings.c:12140 +#: ../src/settings.c:12143 msgid "Fo_cus" msgstr "" -#: ../src/settings.c:12144 +#: ../src/settings.c:12147 msgid "_Path Bar" msgstr "" -#: ../src/settings.c:12146 +#: ../src/settings.c:12149 msgid "_File List" msgstr "" -#: ../src/settings.c:12148 +#: ../src/settings.c:12151 msgid "_Tree" msgstr "" -#: ../src/settings.c:12155 +#: ../src/settings.c:12158 msgctxt "Go|" msgid "_Tab" msgstr "" -#: ../src/settings.c:12161 +#: ../src/settings.c:12164 msgid "_Close" msgstr "" -#: ../src/settings.c:12178 +#: ../src/settings.c:12181 msgid "Styl_e" msgstr "" -#: ../src/settings.c:12181 +#: ../src/settings.c:12184 msgid "C_olumns" msgstr "" -#: ../src/settings.c:12184 +#: ../src/settings.c:12187 msgid "_Reorder" msgstr "" -#: ../src/settings.c:12186 +#: ../src/settings.c:12189 msgid "_Rubberband Select" msgstr "" -#: ../src/settings.c:12199 +#: ../src/settings.c:12202 msgid "_Sort" msgstr "" #. visible #. position -#: ../src/settings.c:12205 ../src/settings.c:12623 +#: ../src/settings.c:12208 ../src/settings.c:12626 msgid "_Size" msgstr "" -#: ../src/settings.c:12207 ../src/settings.c:12630 +#: ../src/settings.c:12210 ../src/settings.c:12633 msgid "_Type" msgstr "" -#: ../src/settings.c:12209 ../src/settings.c:12636 +#: ../src/settings.c:12212 ../src/settings.c:12639 msgid "_Permission" msgstr "" -#: ../src/settings.c:12211 ../src/settings.c:12473 ../src/settings.c:12642 +#: ../src/settings.c:12214 ../src/settings.c:12476 ../src/settings.c:12645 msgid "_Owner" msgstr "" -#: ../src/settings.c:12213 ../src/settings.c:12648 +#: ../src/settings.c:12216 ../src/settings.c:12651 msgid "_Modified" msgstr "" -#: ../src/settings.c:12217 +#: ../src/settings.c:12220 msgid "_Descending" msgstr "" -#: ../src/settings.c:12220 +#: ../src/settings.c:12223 msgid "Nat_ural" msgstr "" -#: ../src/settings.c:12222 +#: ../src/settings.c:12225 msgid "_Case Sensitive" msgstr "" -#: ../src/settings.c:12224 +#: ../src/settings.c:12227 msgid "Folders Fi_rst" msgstr "" -#: ../src/settings.c:12226 +#: ../src/settings.c:12229 msgid "F_iles First" msgstr "" -#: ../src/settings.c:12228 +#: ../src/settings.c:12231 msgid "Mi_xed" msgstr "" -#: ../src/settings.c:12230 +#: ../src/settings.c:12233 msgid "_Hidden First" msgstr "" -#: ../src/settings.c:12232 +#: ../src/settings.c:12235 msgid "Hidden _Last" msgstr "" -#: ../src/settings.c:12235 +#: ../src/settings.c:12238 msgid "Re_fresh" msgstr "" -#: ../src/settings.c:12238 +#: ../src/settings.c:12241 msgid "Auto See_k" msgstr "" #. set->s was custom protocol handler in sfm<=0.9.3 - retained -#: ../src/settings.c:12249 +#: ../src/settings.c:12252 msgid "Path Bar _Help" msgstr "" -#: ../src/settings.c:12262 ../src/ptk/ptk-file-misc.c:710 +#: ../src/settings.c:12265 ../src/ptk/ptk-file-misc.c:710 #: ../src/ptk/ptk-file-misc.c:1246 ../src/ptk/ptk-file-misc.c:2155 msgid "_Rename" msgstr "" -#: ../src/settings.c:12266 ../src/settings.c:12396 +#: ../src/settings.c:12269 ../src/settings.c:12399 msgid "_Delete" msgstr "" -#: ../src/settings.c:12278 +#: ../src/settings.c:12281 msgid "_Actions" msgstr "" -#: ../src/settings.c:12289 +#: ../src/settings.c:12292 msgid "Copy Pa_rent" msgstr "" -#: ../src/settings.c:12292 +#: ../src/settings.c:12295 msgid "Paste _Link" msgstr "" -#: ../src/settings.c:12295 +#: ../src/settings.c:12298 msgid "Paste _Target" msgstr "" -#: ../src/settings.c:12298 +#: ../src/settings.c:12301 msgid "Paste _As" msgstr "" -#: ../src/settings.c:12304 ../src/settings.c:12394 +#: ../src/settings.c:12307 ../src/settings.c:12397 msgid "_Copy To" msgstr "" -#: ../src/settings.c:12308 +#: ../src/settings.c:12311 msgid "L_ocation" msgstr "" -#: ../src/settings.c:12309 ../src/settings.c:12348 +#: ../src/settings.c:12312 ../src/settings.c:12351 msgid "L_ast Location" msgstr "" -#: ../src/settings.c:12312 +#: ../src/settings.c:12315 msgctxt "Edit|CopyTo|" msgid "_Tab" msgstr "" -#: ../src/settings.c:12329 +#: ../src/settings.c:12332 msgctxt "Edit|CopyTo|" msgid "_Panel" msgstr "" -#: ../src/settings.c:12343 +#: ../src/settings.c:12346 msgid "_Move To" msgstr "" -#: ../src/settings.c:12347 +#: ../src/settings.c:12350 msgid "_Location" msgstr "" -#: ../src/settings.c:12350 +#: ../src/settings.c:12353 msgctxt "Edit|MoveTo|" msgid "_Tab" msgstr "" -#: ../src/settings.c:12367 +#: ../src/settings.c:12370 msgctxt "Edit|MoveTo|" msgid "_Panel" msgstr "" -#: ../src/settings.c:12380 +#: ../src/settings.c:12383 msgid "_Select All" msgstr "" -#: ../src/settings.c:12383 +#: ../src/settings.c:12386 msgid "_Unselect All" msgstr "" -#: ../src/settings.c:12385 +#: ../src/settings.c:12388 msgid "_Invert Selection" msgstr "" -#: ../src/settings.c:12387 +#: ../src/settings.c:12390 msgid "S_elect By Pattern" msgstr "" -#: ../src/settings.c:12389 +#: ../src/settings.c:12392 msgid "R_oot" msgstr "" -#: ../src/settings.c:12395 +#: ../src/settings.c:12398 msgid "Move _To" msgstr "" #. Properties -#: ../src/settings.c:12400 +#: ../src/settings.c:12403 msgid "Propert_ies" msgstr "" -#: ../src/settings.c:12411 +#: ../src/settings.c:12414 msgid "_Quick" msgstr "" -#: ../src/settings.c:12433 ../src/settings.c:12463 ../src/settings.c:12489 +#: ../src/settings.c:12436 ../src/settings.c:12466 ../src/settings.c:12492 msgid "_Recursive" msgstr "" -#: ../src/settings.c:12511 +#: ../src/settings.c:12514 msgid "_Toolbar" msgstr "" -#: ../src/settings.c:12523 +#: ../src/settings.c:12526 msgid "T_ree" msgstr "" -#: ../src/settings.c:12535 +#: ../src/settings.c:12538 msgid "_Side Toolbar" msgstr "" -#: ../src/settings.c:12541 +#: ../src/settings.c:12544 msgid "_Detailed" msgstr "" -#: ../src/settings.c:12547 +#: ../src/settings.c:12550 msgid "_Icons" msgstr "" -#: ../src/settings.c:12552 +#: ../src/settings.c:12555 msgid "_Compact" msgstr "" -#: ../src/settings.c:12557 +#: ../src/settings.c:12560 msgid "_Large Icons" msgstr "" -#: ../src/settings.c:12562 +#: ../src/settings.c:12565 msgid "_Hidden Files" msgstr "" -#: ../src/settings.c:12570 +#: ../src/settings.c:12573 #, c-format msgid "File List Font (Panel %d)" msgstr "" -#: ../src/settings.c:12571 +#: ../src/settings.c:12574 msgid "Example 1.1 M file -rwxr--r-- user:group 2011-01-01 01:11" msgstr "" -#: ../src/settings.c:12576 +#: ../src/settings.c:12579 #, c-format msgid "Devices Font (Panel %d)" msgstr "" -#: ../src/settings.c:12577 +#: ../src/settings.c:12580 msgid "sr0 [no media] :EXAMPLE" msgstr "" -#: ../src/settings.c:12583 +#: ../src/settings.c:12586 #, c-format msgid "Bookmarks Font (Panel %d)" msgstr "" -#: ../src/settings.c:12584 +#: ../src/settings.c:12587 msgid "Example Bookmark Name" msgstr "" -#: ../src/settings.c:12590 +#: ../src/settings.c:12593 #, c-format msgid "Path Bar Font (Panel %d)" msgstr "" -#: ../src/settings.c:12591 +#: ../src/settings.c:12594 msgid "$ cat /home/user/example" msgstr "" -#: ../src/settings.c:12597 +#: ../src/settings.c:12600 #, c-format msgid "Tab Font (Panel %d)" msgstr "" -#: ../src/settings.c:12607 +#: ../src/settings.c:12610 #, c-format msgid "Status Bar Font (Panel %d)" msgstr "" -#: ../src/settings.c:12608 +#: ../src/settings.c:12611 msgid "12 G free / 200 G 52 items" msgstr "" @@ -4967,16 +4986,16 @@ #. sort_case #. PTK_LIST_SORT_DIR_FIRST from ptk-file-list.h #. sort_hidden_first -#: ../src/settings.c:12660 +#: ../src/settings.c:12663 msgid "Follow _Dir" msgstr "" #. speed -#: ../src/settings.c:12669 ../src/settings.c:12678 +#: ../src/settings.c:12672 ../src/settings.c:12681 msgid "_New Tab" msgstr "" -#: ../src/settings.c:12673 ../src/settings.c:12683 +#: ../src/settings.c:12676 ../src/settings.c:12686 msgid "_Single Click" msgstr "" @@ -5013,29 +5032,29 @@ "TIP: You can also enter '%% PATTERN' in the path bar." msgstr "" -#: ../src/ptk/ptk-file-browser.c:5444 ../src/ptk/ptk-file-misc.c:4075 +#: ../src/ptk/ptk-file-browser.c:5451 ../src/ptk/ptk-file-misc.c:4075 #: ../src/desktop/desktop-window.c:3285 msgid "Choose Location" msgstr "" -#: ../src/ptk/ptk-file-browser.c:5477 ../src/ptk/ptk-file-browser.c:5511 +#: ../src/ptk/ptk-file-browser.c:5484 ../src/ptk/ptk-file-browser.c:5518 #: ../src/desktop/desktop-window.c:3318 ../src/desktop/desktop-window.c:3349 msgid "Invalid Destination" msgstr "" -#: ../src/ptk/ptk-file-browser.c:5478 ../src/desktop/desktop-window.c:3319 +#: ../src/ptk/ptk-file-browser.c:5485 ../src/desktop/desktop-window.c:3319 msgid "Destination same as source" msgstr "" -#: ../src/ptk/ptk-file-browser.c:5512 ../src/desktop/desktop-window.c:3350 +#: ../src/ptk/ptk-file-browser.c:5519 ../src/desktop/desktop-window.c:3350 msgid "Invalid destination" msgstr "" -#: ../src/ptk/ptk-file-browser.c:5519 +#: ../src/ptk/ptk-file-browser.c:5526 msgid "Hide File" msgstr "" -#: ../src/ptk/ptk-file-browser.c:5521 +#: ../src/ptk/ptk-file-browser.c:5528 msgid "" "The names of the selected files will be added to the '.hidden' file located " "in this folder, which will hide them from view in SpaceFM. You may need to " @@ -5045,11 +5064,11 @@ "of the file, and refresh." msgstr "" -#: ../src/ptk/ptk-file-browser.c:5536 +#: ../src/ptk/ptk-file-browser.c:5543 msgid "Error hiding files" msgstr "" -#: ../src/ptk/ptk-file-browser.c:5544 +#: ../src/ptk/ptk-file-browser.c:5551 msgid "No files are selected" msgstr "" @@ -6909,7 +6928,7 @@ #: ../src/vfs/vfs-file-task.c:634 ../src/vfs/vfs-file-task.c:687 #: ../src/vfs/vfs-file-task.c:835 ../src/vfs/vfs-file-task.c:866 #: ../src/vfs/vfs-file-task.c:951 ../src/vfs/vfs-file-task.c:1093 -#: ../src/vfs/vfs-file-task.c:2103 +#: ../src/vfs/vfs-file-task.c:2106 msgid "Accessing" msgstr "" @@ -6973,26 +6992,26 @@ msgid "Please set a valid terminal program in View|Preferences|Advanced" msgstr "" -#: ../src/vfs/vfs-file-task.c:1833 +#: ../src/vfs/vfs-file-task.c:1835 msgid "spacefm-auth not found in path - this reduces your security" msgstr "" -#: ../src/vfs/vfs-file-task.c:1935 +#: ../src/vfs/vfs-file-task.c:1938 #, c-format msgid "" "Error executing '%s'\n" "See stdout (run spacefm in a terminal) for debug info" msgstr "" -#: ../src/vfs/vfs-file-task.c:2003 +#: ../src/vfs/vfs-file-task.c:2006 msgid "Error writing temporary file" msgstr "" -#: ../src/vfs/vfs-file-task.c:2187 +#: ../src/vfs/vfs-file-task.c:2190 msgid "Timed out calculating total size\n" msgstr "" -#: ../src/vfs/vfs-file-task.c:2519 +#: ../src/vfs/vfs-file-task.c:2523 #, c-format msgid "" "\n" @@ -7337,7 +7356,7 @@ "Automount: error: no mount command available\n" msgstr "" -#: ../src/vfs/vfs-volume-nohal.c:4263 +#: ../src/vfs/vfs-volume-nohal.c:4283 #, c-format msgid "Unmount-If-Mounted: %s\n" msgstr "" diff -Nru spacefm-1.0.4/README spacefm-1.0.5/README --- spacefm-1.0.4/README 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/README 2016-01-20 13:22:23.000000000 +0000 @@ -1,10 +1,13 @@ README for SpaceFM v1.0 -Homepage http://ignorantguru.github.io/spacefm/ - -Downloads https://github.com/IgnorantGuru/spacefm/releases - -Official Forum https://sourceforge.net/p/spacefm/discussion/general/ + Homepage http://ignorantguru.github.io/spacefm/ + Downloads https://github.com/IgnorantGuru/spacefm/releases + News http://ignorantguru.github.io/spacefm/news.html + Wiki https://github.com/IgnorantGuru/spacefm/wiki + Screenshots https://github.com/IgnorantGuru/spacefm/wiki/Screenshots + Users Manual http://ignorantguru.github.io/spacefm/spacefm-manual-en.html + Forum https://sourceforge.net/p/spacefm/discussion/general/ + Report Issues https://github.com/IgnorantGuru/spacefm/issues CONTENTS @@ -97,7 +100,8 @@ For optional dbus support: dbus libdbus-1-3 libdbus-1-dev - RECOMMENDED: eject lsof wget udevil|pmount|udisks gksu|kdesu|ktsuss + RECOMMENDED: udevil|pmount|udisks gksu|kdesu|ktsuss|lxqt-sudo eject lsof + wget For additional mounting support: fuseiso curlftpfs jmtpfs gphotofs ifuse @@ -185,11 +189,12 @@ For additional configure options, see: ./configure --help - To run root commands, SpaceFM supports ktsuss, gksu, gksudo, gnomesu, - kdesu, kdesudo, su-to-root, xdg-su, su, and sudo. To configure an - additional terminal or graphical su program see /etc/spacefm/spacefm.conf. - Or, to build with an additional graphical su program ('/usr/bin/mysu' in - this example), add: --with-preferable-sudo=/usr/bin/mysu + To run root commands, SpaceFM supports gksu, gksudo, gnomesu, kdesu, + kdesudo, ktsuss, lxqt-sudo, xdg-su, su-to-root, su, and sudo. To configure + an additional terminal or graphical su program see + /etc/spacefm/spacefm.conf. Or, to build with an additional graphical su + program ('/usr/bin/mysu' in this example), add: + --with-preferable-sudo=/usr/bin/mysu Note: When using older distros, enabling kernel polling may be required. If you insert a CD and SpaceFM still says 'no media', please see the ENABLE @@ -222,12 +227,17 @@ gdb spacefm - In gdb, enter 'run' at the prompt. SpaceFM will start. When the crash - occurs, gdb will freeze SpaceFM. If SpaceFM hangs, press Ctrl-C in gdb - to interrupt it, or run 'killall -s KILL spacefm' in another terminal. + In gdb, enter 'run' at the prompt. Or, to make gdb halt on any + warnings, use 'run --g-fatal-warnings'. + + SpaceFM will start. When the crash occurs, gdb will freeze SpaceFM. + Or if SpaceFM hangs, press Ctrl-C in gdb to interrupt it, or in another + terminal run: killall -s KILL spacefm + + 5) In gdb enter: thread apply all bt full - 5) In the terminal running gdb enter 'bt full'. Provide the output with - your detailed bug report at https://github.com/IgnorantGuru/spacefm/issues + Provide the output with your detailed bug report at + https://github.com/IgnorantGuru/spacefm/issues NOTE: When SpaceFM is built this way, it may run more slowly and use more memory. Once you are done debugging, be sure to install a normal @@ -252,14 +262,14 @@ Otherwise, run these commands AS ROOT: rm /usr/bin/spacefm /usr/bin/spacefm-auth /usr/bin/spacefm-installer - rm -r /usr/share/spacefm + rm -r /usr/share/spacefm # this may remove SpaceFM plugins rm /usr/share/pixmaps/spacefm.png rm /usr/share/pixmaps/spacefm-*.png rm /usr/share/icons/hicolor/*/apps/spacefm.png rm /usr/share/icons/hicolor/*/apps/spacefm-*.png rm /usr/share/icons/Faenza/apps/48/spacefm.png rm /usr/share/icons/Faenza/apps/48/spacefm-*.png - rm /usr/sharee/*/LC_MESSAGES/spacefm.mo + rm /usr/share/*/LC_MESSAGES/spacefm.mo rm /usr/share/applications/spacefm*.desktop rm /usr/share/mime/packages/spacefm-mime.xml update-mime-database /usr/share/mime > /dev/null @@ -408,7 +418,7 @@ LICENSE - SpaceFM - Copyright (C) 2015 GPL3+ + SpaceFM - Copyright (C) 2016 IgnorantGuru GPL3+ 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 diff -Nru spacefm-1.0.4/release spacefm-1.0.5/release --- spacefm-1.0.4/release 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/release 2016-01-20 13:22:23.000000000 +0000 @@ -113,6 +113,8 @@ echo echo "Copying manual to spacefm-gh-pages..." cp spacefm-manual-en.html ../../spacefm-gh-pages || exit 1 + cp spacefm-manual-en.html \ + ../../spacefm-gh-pages/spacefm-manual-next-en.html || exit 1 fi echo ">>> cd .." cd .. || exit 1 diff -Nru spacefm-1.0.4/spacefm-installer spacefm-1.0.5/spacefm-installer --- spacefm-1.0.4/spacefm-installer 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/spacefm-installer 2016-01-20 13:22:23.000000000 +0000 @@ -161,8 +161,9 @@ echo "SpaceFM Network Install" echo echo "Suggested branches:" - echo " next (Rolling Release)" - echo " master (Stable Release)" + echo " next ( Rolling Release )" + echo " master ( Stable Release )" + echo " alpha ( Testing - not always available )" echo # repeat until branch doesn't contain spaces while [ -z "$branch" ] || [ "$branch" != "${branch/ /}" ]; do @@ -358,7 +359,7 @@ deps_dbus="dbus libdbus-1-3 libdbus-1-dev" deps_mount="fuseiso curlftpfs jmtpfs gphotofs ifuse" deps_debug="gdb libc6-dbg libglib2.0-0-dbg libgtk2.0-0-dbg|libgtk-3-0-dbg librsvg2-dbg" -deps_rec="eject lsof wget udevil|pmount|udisks gksu|kdesu|ktsuss" +deps_rec="eject lsof wget udevil|pmount|udisks gksu|kdesu|lxqt-sudo|ktsuss" n=$'\n' deps="------ Dependencies -------------------------------------------------${n}The following packages are required for this build (below are Debian package${n}names - packages on other distros will be similar):${n}$deps_base" @@ -532,13 +533,17 @@ gdb spacefm - In gdb, enter 'run' at the prompt. SpaceFM will start. When the crash - occurs, gdb will freeze SpaceFM. If SpaceFM hangs, press Ctrl-C in gdb to - interrupt it, or run 'killall -s KILL spacefm' in another terminal. - - In the terminal running gdb enter 'bt full'. Provide the output with your - detailed bug report at https://github.com/IgnorantGuru/spacefm/issues + In gdb, enter 'run' at the prompt. Or, to make gdb halt on any + warnings, use 'run --g-fatal-warnings'. + SpaceFM will start. When the crash occurs, gdb will freeze SpaceFM. + Or if SpaceFM hangs, press Ctrl-C in gdb to interrupt it, or in another + terminal run: killall -s KILL spacefm + + In gdb enter: thread apply all bt full + Provide the output with your detailed bug report at + https://github.com/IgnorantGuru/spacefm/issues + NOTE: When SpaceFM is built this way, it may run more slowly and use more memory. Once you are done debugging, be sure to install a normal (optimized) build. diff -Nru spacefm-1.0.4/src/cust-dialog.c spacefm-1.0.5/src/cust-dialog.c --- spacefm-1.0.4/src/cust-dialog.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/cust-dialog.c 2016-01-20 13:22:23.000000000 +0000 @@ -464,6 +464,9 @@ list = gtk_list_store_newv( colcount, coltypes ); gtk_tree_view_set_model( GTK_TREE_VIEW( view ), GTK_TREE_MODEL( list ) ); + // gtk_tree_view_set_model adds a ref + g_object_unref( list ); + int colx = 0; gboolean start = FALSE; gboolean valid_iter = FALSE; diff -Nru spacefm-1.0.4/src/desktop/desktop-window.c spacefm-1.0.5/src/desktop/desktop-window.c --- spacefm-1.0.4/src/desktop/desktop-window.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/desktop/desktop-window.c 2016-01-20 13:22:23.000000000 +0000 @@ -868,10 +868,22 @@ gtk_icon_theme_get_default(), "folder-home", size, 0, NULL ); } - else if( vfs_file_info_is_image( fi ) && ! fi->big_thumbnail ) - { + else if ( /* app_settings.show_thumbnail && */ !fi->big_thumbnail && ( +#ifdef HAVE_FFMPEG + vfs_file_info_is_video( fi ) || +#endif + ( fi->size < app_settings.max_thumb_size && + vfs_file_info_is_image( fi ) ) ) ) vfs_thumbnail_loader_request( win->dir, fi, TRUE ); + /* thumbnails are always shown on the desktop + else if ( !app_settings.show_thumbnail ) + { + vfs_thumbnail_loader_cancel_all_requests( win->dir, TRUE ); + // Thumbnails are being disabled so ensure the large thumbnails are + // freed - with up to 256x256 images this is a lot of memory + vfs_dir_unload_thumbnails(win->dir, TRUE ); } + */ } } @@ -2991,7 +3003,13 @@ } else items = g_list_prepend( items, item ); - if ( vfs_file_info_is_image( fi ) ) + + if ( /* app_settings.show_thumbnail && */ ( +#ifdef HAVE_FFMPEG + vfs_file_info_is_video( fi ) || +#endif + ( fi->size < app_settings.max_thumb_size && + vfs_file_info_is_image( fi ) ) ) ) vfs_thumbnail_loader_request( dir, fi, TRUE ); } g_mutex_unlock( dir->mutex ); @@ -3080,7 +3098,13 @@ item = g_slice_new0( DesktopItem ); item->fi = vfs_file_info_ref( file ); - if ( !item->fi->big_thumbnail && vfs_file_info_is_image( item->fi ) ) + + if ( !item->fi->big_thumbnail && ( +#ifdef HAVE_FFMPEG + vfs_file_info_is_video( item->fi ) || +#endif + ( item->fi->size < app_settings.max_thumb_size + && vfs_file_info_is_image( item->fi ) ) ) ) vfs_thumbnail_loader_request( dir, item->fi, TRUE ); GCompareDataFunc comp_func = get_sort_func( self ); @@ -3237,7 +3261,15 @@ if( l ) /* found */ { item = (DesktopItem*)l->data; - if ( !item->fi->big_thumbnail && vfs_file_info_is_image( item->fi ) ) + /* check if reloading of thumbnail is needed. + * See also ptk-file-list.c:_ptk_file_list_file_changed() */ + if ( !item->fi->big_thumbnail && ( +#ifdef HAVE_FFMPEG + ( vfs_file_info_is_video( item->fi ) && + time( NULL ) - *vfs_file_info_get_mtime( item->fi ) > 5 ) || +#endif + ( item->fi->size < app_settings.max_thumb_size + && vfs_file_info_is_image( item->fi ) ) ) ) vfs_thumbnail_loader_request( dir, item->fi, TRUE ); if( gtk_widget_get_visible( w ) ) @@ -3783,7 +3815,7 @@ int ret; if( ret = COMP_VIRTUAL( item1, item2 ) ) return ret; - ret = strcmp( item1->fi->mime_type->type, item2->fi->mime_type->type ); + ret = g_strcmp0( item1->fi->mime_type->type, item2->fi->mime_type->type ); if ( ret == 0 ) //sfm ret = g_utf8_collate( item1->fi->disp_name, item2->fi->disp_name ); @@ -4002,6 +4034,16 @@ GList* sel_files = desktop_window_get_selected_files( desktop ); if ( sel_files ) { + if ( !((VFSFileInfo*)sel_files->data)->mime_type ) + { + char* full_path = g_build_filename( desktop->dir->path, + vfs_file_info_get_name( (VFSFileInfo*)sel_files->data ), + NULL ); + if ( full_path ) + vfs_file_info_reload_mime_type( (VFSFileInfo*)sel_files->data, + full_path ); + g_free( full_path ); + } mime_type = vfs_file_info_get_mime_type( (VFSFileInfo*)sel_files->data ); if ( G_LIKELY( ! mime_type ) ) mime_type = vfs_mime_type_get_from_type( XDG_MIME_TYPE_UNKNOWN ); diff -Nru spacefm-1.0.4/src/exo/exo-icon-view.c spacefm-1.0.5/src/exo/exo-icon-view.c --- spacefm-1.0.4/src/exo/exo-icon-view.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/exo/exo-icon-view.c 2016-01-20 13:22:23.000000000 +0000 @@ -1607,11 +1607,28 @@ gdk_window_set_user_data (priv->bin_window, widget); #if !GTK_CHECK_VERSION (3, 0, 0) - /* Attach style/background - this breaks 'dark theme version' styles in GTK3 - * but appears to be needed for GTK2 - https://github.com/IgnorantGuru/spacefm/issues/578 */ - gtk_widget_set_style (widget, gtk_style_attach (gtk_widget_get_style (widget), gtk_widget_get_window(widget))); - gdk_window_set_background (priv->bin_window, >k_widget_get_style (widget)->base[gtk_widget_get_state (widget)]); - gdk_window_set_background (gtk_widget_get_window (widget), >k_widget_get_style (widget)->base[gtk_widget_get_state (widget)]); + /* Attach style/background for GTK2 - this breaks 'dark theme version' styles + * in GTK3 - https://github.com/IgnorantGuru/spacefm/issues/578 */ + + /* This widget is fully reimplementing realize, so must attach a style + * (nothing is there currently) - there is no need to then call + * gtk_widget_set_style, however if you do with a non-NULL style, GTK + * considers the style hardcoded and therefore outside of its inherited 'rc + * style' system, which results in exo_icon_view_style_set no longer being + * called on a theme change */ + widget->style = gtk_style_attach (widget->style, widget->window); + + /* However the true widget window background remains black without the below + * call- the documentation recommends to call gtk_style_set_background, + * however this has no effect with any requested GtkStateType */ + gdk_window_set_background (priv->bin_window, + >k_widget_get_style (widget)->base[gtk_widget_get_state (widget)]); + +#else + /* Adding style class (styling works fine for me without this, but one user + * so far has reported breakage) */ + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (widget)), + GTK_STYLE_CLASS_VIEW); #endif /* map the icons window */ @@ -1755,9 +1772,13 @@ /* let GtkWidget do its work */ (*GTK_WIDGET_CLASS (exo_icon_view_parent_class)->style_set) (widget, previous_style); - /* apply the new style for the bin_window if we're realized */ +#if !GTK_CHECK_VERSION (3, 0, 0) + /* Apply the new style for the bin_window if we're realized - GTK3 handles + * this on its own, the background colour is wrong if you do this for GTK3 */ if (gtk_widget_get_realized (widget)) - gdk_window_set_background (icon_view->priv->bin_window, >k_widget_get_style(widget)->base[gtk_widget_get_state(widget)]); + gdk_window_set_background (icon_view->priv->bin_window, + >k_widget_get_style(widget)->base[gtk_widget_get_state(widget)]); +#endif } @@ -3991,7 +4012,10 @@ rect.height = item->area.height + 2 * focus_width; if (icon_view->priv->bin_window) + { + //printf("draw_item %d,%d %dx%d\n", rect.x, rect.y, rect.width, rect.height ); gdk_window_invalidate_rect (icon_view->priv->bin_window, &rect, TRUE); + } } @@ -6031,7 +6055,6 @@ } - /** * exo_icon_view_select_path: * @icon_view : A #ExoIconView. diff -Nru spacefm-1.0.4/src/item-prop.c spacefm-1.0.5/src/item-prop.c --- spacefm-1.0.4/src/item-prop.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/item-prop.c 2016-01-20 13:22:23.000000000 +0000 @@ -1774,6 +1774,8 @@ // Listview ctxt->view = exo_tree_view_new(); gtk_tree_view_set_model( GTK_TREE_VIEW( ctxt->view ), GTK_TREE_MODEL( list ) ); + // gtk_tree_view_set_model adds a ref + g_object_unref( list ); exo_tree_view_set_single_click( (ExoTreeView*)ctxt->view, TRUE ); gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( ctxt->view ), FALSE ); diff -Nru spacefm-1.0.4/src/main.c spacefm-1.0.5/src/main.c --- spacefm-1.0.4/src/main.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/main.c 2016-01-20 13:22:23.000000000 +0000 @@ -922,7 +922,7 @@ void debug_gdk_threads_leave( const char* message ) { g_debug( "Thread %p tries to release GDK lock: %s", g_thread_self (), message ); - G_LOCK(gdk_lock); + G_UNLOCK(gdk_lock); g_debug( "Thread %p released GDK lock: %s", g_thread_self (), message ); } diff -Nru spacefm-1.0.4/src/main-window.c spacefm-1.0.5/src/main-window.c --- spacefm-1.0.4/src/main-window.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/main-window.c 2016-01-20 13:22:23.000000000 +0000 @@ -6107,6 +6107,8 @@ // View GtkWidget* view = exo_tree_view_new(); gtk_tree_view_set_model( GTK_TREE_VIEW( view ), GTK_TREE_MODEL( list ) ); + // gtk_tree_view_set_model adds a ref + g_object_unref( list ); exo_tree_view_set_single_click( (ExoTreeView*)view, TRUE ); gtk_tree_view_set_enable_search( GTK_TREE_VIEW( view ), FALSE ); //exo_tree_view_set_single_click_timeout( (ExoTreeView*)view, SINGLE_CLICK_TIMEOUT ); diff -Nru spacefm-1.0.4/src/mime-type/mime-type.c spacefm-1.0.5/src/mime-type/mime-type.c --- spacefm-1.0.4/src/mime-type/mime-type.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/mime-type/mime-type.c 2016-01-20 13:22:23.000000000 +0000 @@ -153,6 +153,9 @@ const char* type; struct stat64 _statbuf; + /* IMPORTANT!! vfs-file-info.c:vfs_file_info_reload_mime_type() depends + * on this function only using the st_mode from statbuf. + * Also see vfs-dir.c:vfs_dir_load_thread */ if( statbuf == NULL || G_UNLIKELY( S_ISLNK(statbuf->st_mode) ) ) { statbuf = &_statbuf; @@ -180,9 +183,10 @@ type = NULL; } - //sfm added check for fifo due to hang on one system with a particular pipe - // - is this needed? - if( G_LIKELY(statbuf->st_size > 0 && !S_ISFIFO( statbuf->st_mode ) ) ) + //sfm added check for reg or link due to hangs on fifo and chr dev + if ( G_LIKELY( statbuf->st_size > 0 && + ( S_ISREG( statbuf->st_mode ) || + S_ISLNK( statbuf->st_mode ) ) ) ) { int fd = -1; char* data; diff -Nru spacefm-1.0.4/src/pref-dialog.c spacefm-1.0.5/src/pref-dialog.c --- spacefm-1.0.4/src/pref-dialog.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/pref-dialog.c 2016-01-20 13:22:23.000000000 +0000 @@ -109,8 +109,8 @@ GTK_ICON_SIZE_DIALOG }; // also change max_icon_size in settings.c & lists in prefdlg.ui prefdlg2.ui // see create_size in vfs-thumbnail-loader.c:_vfs_thumbnail_load() -static const int big_icon_sizes[] = { 512, 256, 192, 128, 96, 72, 64, 48, 36, 32, 24, 22 }; -static const int small_icon_sizes[] = { 512, 256, 192, 128, 96, 72, 64, 48, 36, 32, 24, 22, 16, 12 }; +static const int big_icon_sizes[] = { 512, 384, 256, 192, 128, 96, 72, 64, 48, 36, 32, 24, 22 }; +static const int small_icon_sizes[] = { 512, 384, 256, 192, 128, 96, 72, 64, 48, 36, 32, 24, 22, 16, 12 }; static const char* date_formats[] = { "%Y-%m-%d %H:%M", @@ -772,7 +772,19 @@ strstr( terminal, "urxvtc" ) || strstr( terminal, "konsole" ) || strstr( terminal, "gnome-terminal" ) ) ) - xset_msg_dialog( GTK_WIDGET( dlg ), 0, _("Limited Terminal Emulator Selected"), NULL, 0, _("Due to limitations of gnome-terminal, konsole, lxterminal, and urxvtc, use of these terminals with SpaceFM may prevent the Run As Task and Run In Terminal options being used together to run commands. For example, this may cause protocols mounted in a terminal to fail to automatically open after being mounted. For full use of SpaceFM's features, selecting another terminal is recommended."), NULL, "#designmode-command-terminal" ); + /* when changing this list adjust also + * vfs-file-task.c Line ~1655 + * ptk-location-view.c:ptk_location_view_mount_network() + * and string below */ + { + str = g_strdup_printf( _("Use of some terminals (%s) with SpaceFM may prevent the Run As Task and Run In Terminal options being used together to run commands, due to limitations in these terminals. For example, this may cause protocols mounted in a terminal to fail to automatically open after being mounted. For full use of SpaceFM's features, selecting another terminal is recommended."), + "gnome-terminal, konsole, lxterminal, urxvtc" ); + xset_msg_dialog( GTK_WIDGET( dlg ), 0, + _("Limited Terminal Emulator Selected"), + NULL, 0, str, NULL, + "#designmode-command-terminal" ); + g_free( str ); + } } // report missing terminal if ( str = strchr( terminal, ' ' ) ) diff -Nru spacefm-1.0.4/src/ptk/ptk-clipboard.c spacefm-1.0.5/src/ptk/ptk-clipboard.c --- spacefm-1.0.4/src/ptk/ptk-clipboard.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/ptk/ptk-clipboard.c 2016-01-20 13:22:23.000000000 +0000 @@ -11,6 +11,7 @@ #include "ptk-clipboard.h" #include +#include /* for realpath */ #include "vfs-file-info.h" #include "ptk-file-task.h" @@ -456,6 +457,10 @@ gchar* file_path; gint missing_targets = 0; char* str; + char buf[ PATH_MAX + 1 ]; + char* canon; + ssize_t len; + struct stat64 stat; PtkFileTask* task; VFSFileTaskType action; @@ -508,15 +513,34 @@ if ( g_file_test( file_path, G_FILE_TEST_IS_SYMLINK ) ) { str = file_path; - file_path = g_file_read_link ( file_path, NULL ); + // canonicalize target + canon = g_strdup( realpath( file_path, buf ) ); + if ( canon ) + file_path = canon; + else + { + /* fall back to immediate target if canonical target + * missing. + * g_file_read_link() doesn't behave like readlink, + * gives nothing if final target missing */ + len = readlink( file_path, buf, PATH_MAX ); + if ( len > 0 ) + file_path = g_strndup( buf, len ); + else + file_path = NULL; + } g_free( str ); } if ( file_path ) { - if ( g_file_test( file_path, G_FILE_TEST_EXISTS ) ) + // do not use g_file_test here - link target may be missing + if ( lstat64( file_path, &stat ) == 0 ) files = g_list_prepend( files, file_path ); else + { missing_targets++; + g_free( file_path ); + } } } ++puri; diff -Nru spacefm-1.0.4/src/ptk/ptk-dir-tree-view.c spacefm-1.0.5/src/ptk/ptk-dir-tree-view.c --- spacefm-1.0.4/src/ptk/ptk-dir-tree-view.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/ptk/ptk-dir-tree-view.c 2016-01-20 13:22:23.000000000 +0000 @@ -450,46 +450,37 @@ { if ( gtk_tree_model_get_iter( model, &it, tree_path ) ) { + gtk_tree_view_set_cursor( GTK_TREE_VIEW( view ), tree_path, tree_col, FALSE ); - gtk_tree_view_row_activated( GTK_TREE_VIEW( view ), - tree_path, - tree_col ); + if ( evt->button == 3 ) { // right click - VFSFileInfo * file; - gtk_tree_model_get( model, &it, - COL_DIR_TREE_INFO, - &file, -1 ); - if ( file ) + char* dir_path = ptk_dir_tree_view_get_selected_dir( + GTK_TREE_VIEW( view ) ); + if ( ptk_file_browser_chdir( browser, dir_path, + PTK_FB_CHDIR_ADD_HISTORY ) ) { - GtkWidget * popup; - char* file_path; - GList* sel_files; - char* dir_name; - file_path = ptk_dir_view_get_dir_path( model, &it ); - - sel_files = g_list_prepend( NULL, vfs_file_info_ref(file) ); - dir_name = g_path_get_dirname( file_path ); - /* FIXME: New|Tab Here and New|File etc work on the - * wrong location because dir_name is really incorrect. - * But if set to cur dir it breaks Copy, etc. */ - popup = ptk_file_menu_new( NULL, browser, - file_path, file, - dir_name, sel_files ); - g_free( dir_name ); - g_free( file_path ); + /* show right-click menu + * This simulates a right-click in the file list when + * no files are selected (even if some are) since + * actions are to be taken on the dir itself. */ + GtkWidget* popup = ptk_file_menu_new( NULL, browser, + NULL, NULL, + dir_path, NULL ); if ( popup ) gtk_menu_popup( GTK_MENU( popup ), NULL, NULL, - NULL, NULL, 3, evt->time ); - - vfs_file_info_unref( file ); + NULL, NULL, 3, 0 ); gtk_tree_path_free( tree_path ); return TRUE; } } + else + gtk_tree_view_row_activated( GTK_TREE_VIEW( view ), + tree_path, + tree_col ); } gtk_tree_path_free( tree_path ); } @@ -559,6 +550,25 @@ gtk_tree_path_free( path ); return FALSE; } + + char* dir_path = ptk_dir_tree_view_get_selected_dir( + GTK_TREE_VIEW( view ) ); + if ( ptk_file_browser_chdir( browser, dir_path, + PTK_FB_CHDIR_ADD_HISTORY ) ) + { + /* show right-click menu + * This simulates a right-click in the file list when + * no files are selected (even if some are) since + * actions are to be taken on the dir itself. */ + GtkWidget* popup = ptk_file_menu_new( NULL, browser, + NULL, NULL, + dir_path, NULL ); + if ( popup ) + gtk_menu_popup( GTK_MENU( popup ), NULL, NULL, + NULL, NULL, 3, 0 ); + } + + /* this old method operates on the wrong files gtk_tree_model_get( gtk_tree_view_get_model( GTK_TREE_VIEW( view ) ), &iter, COL_DIR_TREE_INFO, @@ -585,6 +595,7 @@ vfs_file_info_unref( file ); } + */ break; default: gtk_tree_path_free( path ); diff -Nru spacefm-1.0.4/src/ptk/ptk-file-archiver.c spacefm-1.0.5/src/ptk/ptk-file-archiver.c --- spacefm-1.0.4/src/ptk/ptk-file-archiver.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/ptk/ptk-file-archiver.c 2016-01-20 13:22:23.000000000 +0000 @@ -393,6 +393,8 @@ // Model is xset name then extensions the handler deals with GtkListStore* list = gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_STRING ); combo = gtk_combo_box_new_with_model( GTK_TREE_MODEL( list ) ); + // gtk_combo_box_new_with_model adds a ref + g_object_unref( list ); g_object_set_data( G_OBJECT( dlg ), "combo-model", (gpointer)list ); // Need to manually create the combobox dropdown cells!! Mapping the diff -Nru spacefm-1.0.4/src/ptk/ptk-file-list.c spacefm-1.0.5/src/ptk/ptk-file-list.c --- spacefm-1.0.4/src/ptk/ptk-file-list.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/ptk/ptk-file-list.c 2016-01-20 13:22:23.000000000 +0000 @@ -259,20 +259,24 @@ static void _ptk_file_list_file_changed( VFSDir* dir, VFSFileInfo* file, PtkFileList* list ) { - if ( !file ) + if ( !file || !dir || dir->cancel ) return; + ptk_file_list_file_changed( dir, file, list ); - /* check if reloading of thumbnail is needed. */ + /* check if reloading of thumbnail is needed. + * See also desktop-window.c:on_file_changed() */ if ( list->max_thumbnail != 0 && ( #ifdef HAVE_FFMPEG - vfs_file_info_is_video( file ) || + ( vfs_file_info_is_video( file ) && + time( NULL ) - *vfs_file_info_get_mtime( file ) > 5 ) || #endif ( file->size /*vfs_file_info_get_size( file )*/ < list->max_thumbnail && vfs_file_info_is_image( file ) ) ) ) { if( ! vfs_file_info_is_thumbnail_loaded( file, list->big_thumbnail ) ) - vfs_thumbnail_loader_request( list->dir, file, list->big_thumbnail ); + vfs_thumbnail_loader_request( list->dir, file, + list->big_thumbnail ); } } diff -Nru spacefm-1.0.4/src/ptk/ptk-file-menu.c spacefm-1.0.5/src/ptk/ptk-file-menu.c --- spacefm-1.0.4/src/ptk/ptk-file-menu.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/ptk/ptk-file-menu.c 2016-01-20 13:22:23.000000000 +0000 @@ -166,6 +166,7 @@ if ( xset_get_b_panel( p, "list_detailed" ) ) { + // setting b to XSET_B_UNSET does not work here xset_set_b_panel( p, "list_icons", FALSE ); xset_set_b_panel( p, "list_compact", FALSE ); } @@ -184,6 +185,7 @@ if ( xset_get_b_panel( p, "list_icons" ) ) { + // setting b to XSET_B_UNSET does not work here xset_set_b_panel( p, "list_detailed", FALSE ); xset_set_b_panel( p, "list_compact", FALSE ); } @@ -202,6 +204,7 @@ if ( xset_get_b_panel( p, "list_compact" ) ) { + // setting b to XSET_B_UNSET does not work here xset_set_b_panel( p, "list_detailed", FALSE ); xset_set_b_panel( p, "list_icons", FALSE ); } @@ -501,7 +504,7 @@ XSet* set_radio; char* desc; - if ( !browser || !menu ) + if ( !browser || !menu || !browser->file_list ) return; int p = browser->mypanel; @@ -635,6 +638,7 @@ set->b = browser->sort_type == GTK_SORT_DESCENDING ? XSET_B_TRUE : XSET_B_FALSE; + // this crashes if !browser->file_list so don't allow if ( browser->file_list ) { set = xset_set_cb( "sortx_natural", on_popup_sort_extra, browser ); @@ -3031,7 +3035,8 @@ data->accel_group = NULL; // action - if ( g_str_has_prefix( set->name, "open_" ) ) + if ( g_str_has_prefix( set->name, "open_" ) && + !g_str_has_prefix( set->name, "open_in_" ) ) { xname = set->name + 5; if ( !strcmp( xname, "edit" ) ) diff -Nru spacefm-1.0.4/src/ptk/ptk-file-misc.c spacefm-1.0.5/src/ptk/ptk-file-misc.c --- spacefm-1.0.4/src/ptk/ptk-file-misc.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/ptk/ptk-file-misc.c 2016-01-20 13:22:23.000000000 +0000 @@ -1820,15 +1820,35 @@ char* get_template_dir() { - char* templates_path = g_strdup( g_getenv( "XDG_TEMPLATES_DIR" ) ); + char* templates_path = NULL; + +#if GLIB_CHECK_VERSION(2, 14, 0) + templates_path = g_strdup( g_get_user_special_dir( + G_USER_DIRECTORY_TEMPLATES ) ); +#endif + if ( !templates_path ) + { + templates_path = g_strdup( g_getenv( "XDG_TEMPLATES_DIR" ) ); + } + if ( !g_strcmp0( templates_path, g_get_home_dir() ) ) + { + /* If $XDG_TEMPLATES_DIR == $HOME this means it is disabled. Don't + * recurse it as this is too many files/folders and may slow + * dialog open and cause filesystem find loops. + * https://wiki.freedesktop.org/www/Software/xdg-user-dirs/ */ + g_free( templates_path ); + templates_path = NULL; + } if ( !dir_has_files( templates_path ) ) { g_free( templates_path ); - templates_path = g_build_filename( g_get_home_dir(), "Templates", NULL ); + templates_path = g_build_filename( g_get_home_dir(), "Templates", + NULL ); if ( !dir_has_files( templates_path ) ) { g_free( templates_path ); - templates_path = g_build_filename( g_get_home_dir(), ".templates", NULL ); + templates_path = g_build_filename( g_get_home_dir(), + ".templates", NULL ); if ( !dir_has_files( templates_path ) ) { g_free( templates_path ); @@ -1873,8 +1893,10 @@ subsubdir = g_strdup( name ); templates = g_list_prepend( templates, g_strdup_printf( "%s/", subsubdir ) ); - templates = get_templates( templates_dir, subsubdir, templates, - getdir ); + // prevent filesystem loops during recursive find + if ( !g_file_test( path, G_FILE_TEST_IS_SYMLINK ) ) + templates = get_templates( templates_dir, subsubdir, + templates, getdir ); g_free( subsubdir ); } } @@ -1888,7 +1910,9 @@ else templates = g_list_prepend( templates, g_strdup( name ) ); } - else if ( g_file_test( path, G_FILE_TEST_IS_DIR ) ) + else if ( g_file_test( path, G_FILE_TEST_IS_DIR ) && + // prevent filesystem loops during recursive find + !g_file_test( path, G_FILE_TEST_IS_SYMLINK ) ) { if ( subdir ) { @@ -2311,7 +2335,8 @@ { templates = g_list_sort( templates, (GCompareFunc) g_strcmp0 ); GList* l; - for ( l = templates; l; l = l->next ) + int x = 0; + for ( l = templates; l && x++ < 500; l = l->next ) { gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT( mset->combo_template ), (char*)l->data ); @@ -3790,7 +3815,8 @@ err = NULL; if ( ! vfs_exec_on_screen ( screen, cwd, argv, NULL, vfs_file_info_get_disp_name( file ), - VFS_EXEC_DEFAULT_FLAGS, &err ) ) + VFS_EXEC_DEFAULT_FLAGS, + TRUE, &err ) ) { toplevel = file_browser ? gtk_widget_get_toplevel( GTK_WIDGET( file_browser ) ) : diff -Nru spacefm-1.0.4/src/ptk/ptk-file-properties.c spacefm-1.0.5/src/ptk/ptk-file-properties.c --- spacefm-1.0.4/src/ptk/ptk-file-properties.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/ptk/ptk-file-properties.c 2016-01-20 13:22:23.000000000 +0000 @@ -524,6 +524,8 @@ 1, _("Choose..."), -1 ); gtk_combo_box_set_model( GTK_COMBO_BOX(open_with), GTK_TREE_MODEL(model) ); + // gtk_combo_box_set_model adds a ref + g_object_unref( model ); gtk_combo_box_set_row_separator_func( GTK_COMBO_BOX(open_with), combo_sep, NULL, NULL ); diff -Nru spacefm-1.0.4/src/ptk/ptk-handler.c spacefm-1.0.5/src/ptk/ptk-handler.c --- spacefm-1.0.4/src/ptk/ptk-handler.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/ptk/ptk-handler.c 2016-01-20 13:22:23.000000000 +0000 @@ -318,8 +318,8 @@ { "hand_fs_+udiso", "udevil iso unmount", - "iso9660", - "", + "+iso9660 +dev=/dev/loop*", + "optical=1 removable=1", "# Mounting of iso files is performed by udevil in a file handler,\n# not this device handler. Right-click on any file and select\n# Open|File Handlers, and select Mount ISO to see this command.", FALSE, "# Note: non-iso9660 types will fall through to Default unmount handler\nudevil umount \"%a\"\n", @@ -871,22 +871,22 @@ element = elements[i]; required = FALSE; } - if ( msg ) - match = FALSE; + match = FALSE; for ( l = values; l; l = l->next ) { if ( fnmatch( element, (char*)l->data, 0 ) == 0 ) { // match ret = match = TRUE; + break; } - else if ( required ) - { - // no match of required - g_strfreev( elements ); - g_free( ret_msg ); - return FALSE; - } + } + if ( required && !match ) + { + // no match of required + g_strfreev( elements ); + g_free( ret_msg ); + return FALSE; } if ( msg ) { @@ -3015,6 +3015,9 @@ hnd->view_handlers = exo_tree_view_new(); gtk_tree_view_set_model( GTK_TREE_VIEW( hnd->view_handlers ), GTK_TREE_MODEL( hnd->list ) ); + // gtk_tree_view_set_model adds a ref + g_object_unref( hnd->list ); + /*igcr probably doesn't need to be single click, as you're not using row * activation, only selection changed? */ exo_tree_view_set_single_click( ((ExoTreeView*)hnd->view_handlers), TRUE ); diff -Nru spacefm-1.0.4/src/ptk/ptk-location-view.c spacefm-1.0.5/src/ptk/ptk-location-view.c --- spacefm-1.0.4/src/ptk/ptk-location-view.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/ptk/ptk-location-view.c 2016-01-20 13:22:23.000000000 +0000 @@ -42,7 +42,6 @@ static GtkTreeModel* bookmodel = NULL; static int n_vols = 0; static guint theme_changed = 0; /* GtkIconTheme::"changed" handler */ -static guint theme_bookmark_changed = 0; /* GtkIconTheme::"changed" handler */ static gboolean has_desktop_dir = TRUE; static gboolean show_trash_can = FALSE; @@ -738,6 +737,8 @@ char* ptk_location_view_get_mount_point_dir( const char* name ) { char* parent = NULL; + char* str; + char* value; // clean mount points if ( name ) @@ -750,6 +751,46 @@ parent = g_build_filename( g_get_home_dir(), set->s + 2, NULL ); else parent = g_strdup( set->s ); + if ( parent ) + { + const char* varname[] = + { "$USER", "$UID", "$HOME", "$XDG_RUNTIME_DIR", "$XDG_CACHE_HOME" }; + int i; + for ( i = 0; i < G_N_ELEMENTS( varname ); i++ ) + { + if ( !strstr( parent, varname[i] ) ) + continue; + switch ( i ) { + case 0: // $USER + value = g_strdup( g_get_user_name() ); + break; + case 1: // $UID + value = g_strdup_printf( "%d", geteuid() ); + break; + case 2: // $HOME + value = g_strdup( g_get_home_dir() ); + break; + case 3: // $XDG_RUNTIME_DIR +#if GLIB_CHECK_VERSION(2, 28, 0) + value = g_strdup( g_get_user_runtime_dir() ); +#else + value = g_strdup( g_getenv( "XDG_RUNTIME_DIR" ) ); +#endif + break; + case 4: // $XDG_CACHE_HOME + value = g_strdup( g_get_user_cache_dir() ); + break; + default: + value = g_strdup( "" ); + } + str = parent; + parent = replace_string( parent, varname[i], value, FALSE ); + g_free( str ); + g_free( value ); + } + g_mkdir_with_parents( parent, 0700 ); + chmod( parent, 0700 ); + } if ( !have_rw_access( parent ) ) { g_free( parent ); @@ -1292,6 +1333,9 @@ ao->job = PTK_OPEN_DIR; /* These terminals provide no option to start a new instance; child * exit occurs immediately so can't delete mount point dir on exit. */ + /* when changing this list adjust also + * vfs-file-task.c Line ~1655 + * pref-dialog.c Line ~777 */ ao->keep_point = ( run_in_terminal && ( terminal = xset_get_s( "main_terminal" ) ) && ( strstr( terminal, "lxterminal" ) || @@ -4545,9 +4589,9 @@ { GtkIconTheme* icon_theme = gtk_icon_theme_get_default(); icon = vfs_load_icon ( icon_theme, icon1, icon_size ); - if ( !icon ) + if ( !icon && icon2 ) icon = vfs_load_icon ( icon_theme, icon2, icon_size ); - if ( !icon ) + if ( !icon && icon3 ) icon = vfs_load_icon ( icon_theme, icon3, icon_size ); gtk_list_store_set( list, it, COL_ICON, icon, -1 ); @@ -4655,7 +4699,7 @@ // bookmark pane is shown - add after selected or to end of list sel_set = get_selected_bookmark_set( GTK_TREE_VIEW( file_browser->side_book ) ); - if ( !sel_set ) + if ( !sel_set && file_browser->book_set_name ) { // none selected - get last set in list set = xset_get( file_browser->book_set_name ); @@ -4706,7 +4750,7 @@ void ptk_bookmark_view_update_icons( GtkIconTheme* icon_theme, PtkFileBrowser* file_browser ) { - if ( !( file_browser && file_browser->side_book ) ) + if ( !( GTK_IS_WIDGET( file_browser ) && file_browser->side_book ) ) return; GtkTreeView* view = GTK_TREE_VIEW( file_browser->side_book ); @@ -4810,7 +4854,7 @@ { // select bookmark of cur dir if recurse and option 'Follow Dir' // select bookmark of cur dir if !recurse, ignoring option 'Follow Dir' - XSet* parent_set; + XSet* parent_set = NULL; XSet* set; if ( !file_browser || !view || @@ -4840,10 +4884,11 @@ } g_free( url ); } - + // look in current bookmark list - XSet* start_set = xset_get( file_browser->book_set_name ); - set = find_cwd_match_bookmark( start_set, cwd, FALSE, NULL, &parent_set ); + XSet* start_set = xset_is( file_browser->book_set_name ); + set = start_set ? find_cwd_match_bookmark( + start_set, cwd, FALSE, NULL, &parent_set ) : NULL; if ( !set && recurse ) { // look thru all of main_book, skipping start_set @@ -4852,7 +4897,8 @@ } - if ( set && g_strcmp0( parent_set->name, start_set->name ) ) + if ( set && parent_set && + ( !start_set || g_strcmp0( parent_set->name, start_set->name ) ) ) { g_free( file_browser->book_set_name ); file_browser->book_set_name = g_strdup( parent_set->name ); @@ -4913,7 +4959,7 @@ // bookmark pane is shown - add after selected or to end of list sel_set = get_selected_bookmark_set( GTK_TREE_VIEW( file_browser->side_book ) ); - if ( !sel_set ) + if ( !sel_set && file_browser->book_set_name ) { // none selected - get last set in list set = xset_get( file_browser->book_set_name ); @@ -5114,8 +5160,10 @@ static void on_bookmark_model_destroy( gpointer data, GObject* object ) { - g_signal_handler_disconnect( gtk_icon_theme_get_default(), - theme_bookmark_changed ); + g_signal_handlers_disconnect_matched( gtk_icon_theme_get_default(), + G_SIGNAL_MATCH_DATA, + 0, 0, NULL, NULL, + data /* file_browser */ ); } static void on_bookmark_row_deleted( GtkTreeModel* list, @@ -5130,7 +5178,8 @@ // DND has moved a bookmark // This signal also fires many times on other events, so ignore if !stamp - if ( !( file_browser && file_browser->book_iter_inserted.stamp ) ) + if ( !( file_browser && file_browser->book_set_name && + file_browser->book_iter_inserted.stamp ) ) return; //printf("on_bookmark_row_deleted\n"); @@ -5148,8 +5197,7 @@ return; // Did user drag first item? - if ( file_browser->book_set_name && - !strcmp( file_browser->book_set_name, inserted_name ) ) + if ( !strcmp( file_browser->book_set_name, inserted_name ) ) { ptk_bookmark_view_reload_list( view, xset_get( file_browser->book_set_name ) ); @@ -5294,7 +5342,8 @@ insert_set = xset_is( set->child ); bookmark_selected = FALSE; } - else if ( !strcmp( set->name, file_browser->book_set_name ) ) + else if ( file_browser->book_set_name && + !strcmp( set->name, file_browser->book_set_name ) ) // user right-click on top item insert_set = xset_is( set->child ); // for inserts, get last child @@ -5483,12 +5532,19 @@ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN ); - g_object_weak_ref( G_OBJECT( list ), on_bookmark_model_destroy, NULL ); + g_object_weak_ref( G_OBJECT( list ), on_bookmark_model_destroy, + file_browser ); view = gtk_tree_view_new_with_model( GTK_TREE_MODEL( list ) ); + + /* gtk_tree_view_new_with_model adds a ref so we don't need original ref + * Otherwise on_bookmark_model_destroy was not running - list model + * wasn't being freed? */ + g_object_unref( list ); icon_theme = gtk_icon_theme_get_default(); - theme_bookmark_changed = g_signal_connect( icon_theme, "changed", + if ( icon_theme ) + g_signal_connect( icon_theme, "changed", G_CALLBACK( ptk_bookmark_view_update_icons ), file_browser ); // no dnd if using auto-reorderable unless you code reorder dnd manually diff -Nru spacefm-1.0.4/src/settings.c spacefm-1.0.5/src/settings.c --- spacefm-1.0.4/src/settings.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/settings.c 2016-01-20 13:22:23.000000000 +0000 @@ -45,7 +45,7 @@ #include "ptk-location-view.h" #include "exo-icon-chooser-dialog.h" /* for exo_icon_chooser_dialog_new */ -#define CONFIG_VERSION "34" // 1.0.4 +#define CONFIG_VERSION "37" // 1.0.5 #define DEFAULT_TMP_DIR "/tmp" @@ -1569,6 +1569,25 @@ if ( set && !set->disable ) // user changed default handler set->keep_terminal = XSET_B_TRUE; } + if ( ver < 37 ) // < 1.0.5 + { + // udevil unmount iso device handler has new whitelist/blacklist + set = xset_is( "hand_fs_+udiso" ); + if ( set && !set->disable ) + { + // user changed default handler + if ( set->s && !strcmp( set->s, "iso9660" ) ) + { + g_free( set->s ); + set->s = g_strdup( "+iso9660 +dev=/dev/loop*" ); + } + if ( !set->x || ( set->x && set->x[0] == '\0' ) ) + { + g_free( set->x ); + set->x = g_strdup( "optical=1 removable=1" ); + } + } + } // add default bookmarks ptk_bookmark_view_get_first_bookmark( NULL ); @@ -3981,10 +4000,11 @@ icon2 = "gnome-fs-directory"; icon3 = "gtk-directory"; } - icon_new = vfs_load_icon( icon_theme, icon1, icon_size ); - if ( !icon_new ) + if ( icon1 ) + icon_new = vfs_load_icon( icon_theme, icon1, icon_size ); + if ( !icon_new && icon2 ) icon_new = vfs_load_icon( icon_theme, icon2, icon_size ); - if ( !icon_new ) + if ( !icon_new && icon3 ) icon_new = vfs_load_icon( icon_theme, icon3, icon_size ); } else @@ -10927,7 +10947,7 @@ set = xset_set( "dev_automount_dirs", "lbl", _("Mount _Dirs...") ); xset_set_set( set, "title", _("Automatic Mount Point Dirs") ); set->menu_style = XSET_MENU_STRING; - xset_set_set( set, "desc", _("Enter the directory where SpaceFM should automatically create mount point directories for fuse and similar filesystems (%%a in handler commands). This directory must exist and be user-writable (do NOT use /media), and empty subdirectories will be removed. If left blank, ~/.cache/spacefm/ (or $XDG_CACHE_HOME/spacefm/) is used.\n\nNote that some handlers or mount programs may not obey this setting.\n\n") ); + xset_set_set( set, "desc", _("Enter the directory where SpaceFM should automatically create mount point directories for fuse and similar filesystems (%%a in handler commands). This directory must be user-writable (do NOT use /media), and empty subdirectories will be removed. If left blank, ~/.cache/spacefm/ (or $XDG_CACHE_HOME/spacefm/) is used. The following variables are recognized: $USER $UID $HOME $XDG_RUNTIME_DIR $XDG_CACHE_HOME\n\nNote that some handlers or mount programs may not obey this setting.\n") ); set->line = g_strdup( "#devices-settings-mdirs" ); set = xset_set( "dev_auto_open", "lbl", _("Open _Tab") ); @@ -11006,7 +11026,7 @@ set->line = g_strdup( "#devices-menu-remount" ); set = xset_set( "dev_change", "lbl", _("_Change Detection") ); - xset_set_set( set, "desc", _("Enter your comma- or space-separated list of filesystems which should NOT be monitored for changes. This setting only affects non-block devices (such as nfs or fuse), and is usually used to prevent SpaceFM becoming unresponsive with network filesystems. Loading of thumbnails will also be disabled.") ); + xset_set_set( set, "desc", _("Enter your comma- or space-separated list of filesystems which should NOT be monitored for file changes. This setting only affects non-block devices (such as nfs or fuse), and is usually used to prevent SpaceFM becoming unresponsive with network filesystems. Loading of thumbnails and subdirectory sizes will also be disabled.") ); set->menu_style = XSET_MENU_STRING; xset_set_set( set, "title", _("Change Detection Blacklist") ); xset_set_set( set, "icn", "gtk-edit" ); @@ -11416,7 +11436,7 @@ xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a new SpaceFM window is opened:\n\nUse:\n\t%%e\tevent type (evt_win_new)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\ttab\n\nExported bash variables (eg $fm_pwd, etc) can be used in this command.") ); set->line = g_strdup( "#sockets-events-winnew" ); - set = xset_set( "evt_win_focus", "lbl", _("_Focus") ); + set = xset_set( "evt_win_focus", "lbl", C_("View|Events|Window|", "_Focus") ); set->menu_style = XSET_MENU_STRING; xset_set_set( set, "title", _("Set Window Focus Command") ); xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a SpaceFM window gets focus:\n\nUse:\n\t%%e\tevent type (evt_win_focus)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\ttab\n\nExported bash variables (eg $fm_pwd, etc) can be used in this command.") ); @@ -11428,7 +11448,7 @@ xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a SpaceFM window is moved or resized:\n\nUse:\n\t%%e\tevent type (evt_win_move)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\ttab\n\nExported bash variables (eg $fm_pwd, etc) can be used in this command.\n\nNote: This command may be run multiple times during resize.") ); set->line = g_strdup( "#sockets-events-winmov" ); - set = xset_set( "evt_win_click", "lbl", _("_Click") ); + set = xset_set( "evt_win_click", "lbl", C_("View|Events|Window|", "_Click") ); set->menu_style = XSET_MENU_STRING; xset_set_set( set, "title", _("Set Click Command") ); xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever the mouse is clicked:\n\nUse:\n\t%%e\tevent type (evt_win_click)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\ttab\n\t%%b\tbutton (mouse button pressed)\n\t%%m\tmodifier (modifier keys)\n\t%%f\tfocus (element which received the click)\n\nExported bash variables (eg $fm_pwd, etc) can be used in this command when no asterisk prefix is used.\n\nPrefix your command with an asterisk (*) and conditionally return exit status 0 to inhibit the default handler. For example:\n*if [ \"%%b\" != \"2\" ]; then exit 1; fi; spacefm -g --label \"\\nMiddle button was clicked in %%f\" --button ok &") ); @@ -11440,7 +11460,7 @@ xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a key is pressed:\n\nUse:\n\t%%e\tevent type (evt_win_key)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\ttab\n\t%%k\tkey code (key pressed)\n\t%%m\tmodifier (modifier keys)\n\nExported bash variables (eg $fm_pwd, etc) can be used in this command when no asterisk prefix is used.\n\nPrefix your command with an asterisk (*) and conditionally return exit status 0 to inhibit the default handler. For example:\n*if [ \"%%k\" != \"0xffc5\" ]; then exit 1; fi; spacefm -g --label \"\\nKey F8 was pressed.\" --button ok &") ); set->line = g_strdup( "#sockets-events-winkey" ); - set = xset_set( "evt_win_close", "lbl", _("Cl_ose") ); + set = xset_set( "evt_win_close", "lbl", C_("View|Events|Window|", "Cl_ose") ); set->menu_style = XSET_MENU_STRING; xset_set_set( set, "title", _("Set Window Close Command") ); xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a SpaceFM window is closed:\n\nUse:\n\t%%e\tevent type (evt_win_close)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\ttab\n\nExported bash variables (eg $fm_pwd, etc) can be used in this command.") ); @@ -11451,7 +11471,7 @@ xset_set_set( set, "desc", "evt_pnl_focus evt_pnl_show evt_pnl_sel" ); set->line = g_strdup( "#sockets-menu" ); - set = xset_set( "evt_pnl_focus", "lbl", _("_Focus") ); + set = xset_set( "evt_pnl_focus", "lbl", C_("View|Events|Panel|", "_Focus") ); set->menu_style = XSET_MENU_STRING; xset_set_set( set, "title", _("Set Panel Focus Command") ); xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a panel gets focus:\n\nUse:\n\t%%e\tevent type (evt_pnl_focus)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\ttab\n\nExported bash variables (eg $fm_pwd, etc) can be used in this command.") ); @@ -11474,7 +11494,7 @@ xset_set_set( set, "desc", "evt_tab_new evt_tab_chdir evt_tab_focus evt_tab_close" ); set->line = g_strdup( "#sockets-menu" ); - set = xset_set( "evt_tab_new", "lbl", _("_New") ); + set = xset_set( "evt_tab_new", "lbl", C_("View|Events|Tab|", "_New") ); set->menu_style = XSET_MENU_STRING; xset_set_set( set, "title", _("Set New Tab Command") ); xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a new tab is opened:\n\nUse:\n\t%%e\tevent type (evt_tab_new)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\ttab\n\nExported bash variables (eg $fm_pwd, etc) can be used in this command.") ); @@ -11486,7 +11506,7 @@ xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a tab changes to a different directory:\n\nUse:\n\t%%e\tevent type (evt_tab_chdir)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\ttab\n\t%%d\tnew directory\n\nExported bash variables (eg $fm_pwd, etc) can be used in this command.") ); set->line = g_strdup( "#sockets-events-tabchdir" ); - set = xset_set( "evt_tab_focus", "lbl", _("_Focus") ); + set = xset_set( "evt_tab_focus", "lbl", C_("View|Events|Tab|", "_Focus") ); set->menu_style = XSET_MENU_STRING; xset_set_set( set, "title", _("Set Tab Focus Command") ); xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a tab gets focus:\n\nUse:\n\t%%e\tevent type (evt_tab_focus)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\ttab\n\nExported bash variables (eg $fm_pwd, etc) can be used in this command.") ); @@ -11498,7 +11518,7 @@ xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a tab is closed:\n\nUse:\n\t%%e\tevent type (evt_tab_close)\n\t%%w\twindow id (see spacefm -s help)\n\t%%p\tpanel\n\t%%t\tclosed tab") ); set->line = g_strdup( "#sockets-events-tabcls" ); - set = xset_set( "evt_device", "lbl", _("_Device") ); + set = xset_set( "evt_device", "lbl", C_("View|Events|", "_Device") ); set->menu_style = XSET_MENU_STRING; xset_set_set( set, "title", _("Set Device Command") ); xset_set_set( set, "desc", _("Enter program or bash command line to be run automatically whenever a device state changes:\n\nUse:\n\t%%e\tevent type (evt_device)\n\t%%f\tdevice file\n\t%%v\tchange (added|removed|changed)\n") ); diff -Nru spacefm-1.0.4/src/settings.h spacefm-1.0.5/src/settings.h --- spacefm-1.0.4/src/settings.h 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/settings.h 2016-01-20 13:22:23.000000000 +0000 @@ -346,7 +346,8 @@ "urxvt", "xterm", "x-terminal-emulator", - "lilyterm" + "lilyterm", + "qterminal" }; static const char* su_commands[] = // order and contents must match prefdlg.ui @@ -365,6 +366,8 @@ "/usr/bin/kdesu", // may be translated to "$(kde4-config --path libexec)/kdesu" "/usr/bin/kdesudo", "/usr/bin/ktsuss", + "/usr/bin/lxqt-sudo", + "/usr/bin/lxsu", "/usr/bin/su-to-root", "/bin/su", "/usr/bin/sudo" diff -Nru spacefm-1.0.4/src/vfs/vfs-app-desktop.c spacefm-1.0.5/src/vfs/vfs-app-desktop.c --- spacefm-1.0.4/src/vfs/vfs-app-desktop.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/vfs/vfs-app-desktop.c 2016-01-20 13:22:23.000000000 +0000 @@ -87,6 +87,8 @@ "Terminal", NULL ); app->hidden = g_key_file_get_boolean( file, desktop_entry_name, "NoDisplay", NULL ); + app->startup = g_key_file_get_boolean( file, desktop_entry_name, + "StartupNotify", NULL ); app->path = g_key_file_get_string ( file, desktop_entry_name, "Path", NULL); } @@ -315,6 +317,11 @@ return app->hidden; } +gboolean vfs_app_desktop_uses_startup_notify( VFSAppDesktop* app ) +{ + return app->startup; +} + /* * Parse Exec command line of app desktop file, and translate * it into a real command which can be passed to g_spawn_command_line_async(). @@ -528,12 +535,14 @@ if( g_shell_parse_argv( cmd, &argc, &argv, NULL ) ) { vfs_exec_on_screen( screen, - app->path && app->path[0] ? - app->path : working_dir, - argv, NULL, - sn_desc, - VFS_EXEC_DEFAULT_FLAGS, - err ); + app->path && app->path[0] ? + app->path : working_dir, + argv, NULL, + sn_desc, + VFS_EXEC_DEFAULT_FLAGS, + vfs_app_desktop_uses_startup_notify( + app ), + err ); g_strfreev( argv ); } } @@ -572,13 +581,15 @@ if( g_shell_parse_argv( cmd, &argc, &argv, NULL ) ) { vfs_exec_on_screen( screen, - app->path && app->path[0] ? - app->path : working_dir, - argv, NULL, sn_desc, - G_SPAWN_SEARCH_PATH| - G_SPAWN_STDOUT_TO_DEV_NULL| - G_SPAWN_STDERR_TO_DEV_NULL, - err ); + app->path && app->path[0] ? + app->path : working_dir, + argv, NULL, sn_desc, + G_SPAWN_SEARCH_PATH| + G_SPAWN_STDOUT_TO_DEV_NULL| + G_SPAWN_STDERR_TO_DEV_NULL, + vfs_app_desktop_uses_startup_notify( + app ), + err ); g_strfreev( argv ); } } diff -Nru spacefm-1.0.4/src/vfs/vfs-app-desktop.h spacefm-1.0.5/src/vfs/vfs-app-desktop.h --- spacefm-1.0.4/src/vfs/vfs-app-desktop.h 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/vfs/vfs-app-desktop.h 2016-01-20 13:22:23.000000000 +0000 @@ -31,6 +31,7 @@ char* full_path; // path of desktop file gboolean terminal : 1; gboolean hidden : 1; + gboolean startup : 1; /* */ int n_ref; diff -Nru spacefm-1.0.4/src/vfs/vfs-dir.c spacefm-1.0.5/src/vfs/vfs-dir.c --- spacefm-1.0.4/src/vfs/vfs-dir.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/vfs/vfs-dir.c 2016-01-20 13:22:23.000000000 +0000 @@ -329,8 +329,9 @@ { GList* l; - if ( !force && dir->avoid_changes ) - return; + // Ignore avoid_changes for creation of files + //if ( !force && dir->avoid_changes ) + // return; if ( G_UNLIKELY( 0 == strcmp(file_name, dir->path) ) ) { diff -Nru spacefm-1.0.4/src/vfs/vfs-execute.c spacefm-1.0.5/src/vfs/vfs-execute.c --- spacefm-1.0.4/src/vfs/vfs-execute.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/vfs/vfs-execute.c 2016-01-20 13:22:23.000000000 +0000 @@ -34,7 +34,7 @@ GError **err ) { return vfs_exec_on_screen( gdk_screen_get_default(), work_dir, - argv, envp, disp_name, flags, err ); + argv, envp, disp_name, flags, TRUE, err ); } #ifdef HAVE_SN @@ -107,6 +107,7 @@ char** argv, char** envp, const char* disp_name, GSpawnFlags flags, + gboolean use_startup_notify, GError **err ) { #ifdef HAVE_SN @@ -141,9 +142,13 @@ } #ifdef HAVE_SN - display = sn_display_new ( GDK_SCREEN_XDISPLAY ( screen ), + if ( use_startup_notify ) + display = sn_display_new ( GDK_SCREEN_XDISPLAY ( screen ), ( SnDisplayErrorTrapPush ) gdk_error_trap_push, ( SnDisplayErrorTrapPush ) gdk_error_trap_pop ); + else + display = NULL; + if ( G_LIKELY ( display ) ) { if ( !disp_name ) diff -Nru spacefm-1.0.4/src/vfs/vfs-execute.h spacefm-1.0.5/src/vfs/vfs-execute.h --- spacefm-1.0.4/src/vfs/vfs-execute.h 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/vfs/vfs-execute.h 2016-01-20 13:22:23.000000000 +0000 @@ -31,6 +31,7 @@ char** argv, char** envp, const char* disp_name, GSpawnFlags flags, + gboolean use_startup_notify, GError **err ); G_END_DECLS diff -Nru spacefm-1.0.4/src/vfs/vfs-file-task.c spacefm-1.0.5/src/vfs/vfs-file-task.c --- spacefm-1.0.4/src/vfs/vfs-file-task.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/vfs/vfs-file-task.c 2016-01-20 13:22:23.000000000 +0000 @@ -1654,9 +1654,12 @@ */ if ( !task->exec_keep_tmp && terminal && ( strstr( terminal, "lxterminal" ) || - strstr( terminal, "urxvtc" ) || // sure no option avail? + strstr( terminal, "urxvtc" ) || // sure no option avail? strstr( terminal, "konsole" ) || strstr( terminal, "gnome-terminal" ) ) ) + /* when changing this list adjust also + * ptk-location-view.c:ptk_location_view_mount_network() + * pref-dialog.c Line ~777 */ { result = fprintf( file, "trap \"rm -f %s; exit\" EXIT SIGINT SIGTERM SIGQUIT SIGHUP\n\n", task->exec_script ); @@ -1764,6 +1767,10 @@ single_arg = TRUE; } else + /* Note: Some terminals accept multiple arguments to -e, whereas + * others needs the entire command quoted and passed as a single + * argument to -e. SpaceFM uses spacefm-auth to run commands, + * so only a single argument is ever used as the command. */ argv[a++] = g_strdup( "-e" ); use_su = su; diff -Nru spacefm-1.0.4/src/vfs/vfs-thumbnail-loader.c spacefm-1.0.5/src/vfs/vfs-thumbnail-loader.c --- spacefm-1.0.4/src/vfs/vfs-thumbnail-loader.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/vfs/vfs-thumbnail-loader.c 2016-01-20 13:22:23.000000000 +0000 @@ -436,7 +436,12 @@ /* load existing thumbnail */ thumbnail = gdk_pixbuf_new_from_file( thumbnail_file, NULL ); - if ( !thumbnail || + if ( thumbnail ) + { + w = gdk_pixbuf_get_width( thumbnail ); + h = gdk_pixbuf_get_height( thumbnail ); + } + if ( !thumbnail || ( w < size && h < size ) || !( thumb_mtime = gdk_pixbuf_get_option( thumbnail, "tEXt::Thumb::MTime" ) ) || atol( thumb_mtime ) != mtime ) diff -Nru spacefm-1.0.4/src/vfs/vfs-utils.c spacefm-1.0.5/src/vfs/vfs-utils.c --- spacefm-1.0.4/src/vfs/vfs-utils.c 2015-10-17 19:30:27.000000000 +0000 +++ spacefm-1.0.5/src/vfs/vfs-utils.c 2016-01-20 13:22:23.000000000 +0000 @@ -29,6 +29,10 @@ { GdkPixbuf* icon = NULL; const char* file; + + if ( !icon_name ) + return NULL; + GtkIconInfo* inf = gtk_icon_theme_lookup_icon( theme, icon_name, size, GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_FORCE_SIZE );