[gnome-commander/treeview: 110/110] Merge branch 'master' into treeview

[Piotr Eljasiak <epiotr src gnome org>]

commit fddbc07582186fedb220f6a742bd8f7408ae5ab7
Merge: 1dd1fa2 2614f69
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Tue Oct 4 21:29:25 2011 +0200

    Merge branch 'master' into treeview

 AUTHORS                                            |    1 +
 NEWS                                               |   12 +
 README.in                                          |    3 +-
 TODO                                               |    7 +-
 configure.in                                       |   28 +-
 data/gnome-commander.spec.in                       |    5 +
 doc/C/figures/gnome-commander_options_network.png  |  Bin 20471 -> 0 bytes
 doc/C/gnome-commander.xml                          |  117 +-
 doc/cs/figures/gnome-commander_options_network.png |  Bin 30284 -> 0 bytes
 doc/de/de.po                                       | 2471 ++++++++++----------
 doc/de/figures/gnome-commander_options_network.png |  Bin 21612 -> 0 bytes
 doc/es/es.po                                       | 2523 ++++++++++----------
 doc/es/figures/gnome-commander_options_network.png |  Bin 20956 -> 0 bytes
 doc/fr/figures/gnome-commander_options_network.png |  Bin 30917 -> 0 bytes
 doc/gnome-commander.1                              |    6 -
 doc/keys.txt                                       |    2 +
 doc/sl/figures/gnome-commander_options_network.png |  Bin 23498 -> 0 bytes
 libgcmd/gnome-cmd-string-dialog.cc                 |    4 +-
 libgcmd/gnome-cmd-string-dialog.h                  |   16 +-
 libgcmd/libgcmd-widget-factory.cc                  |    6 -
 libgcmd/libgcmd-widget-factory.h                   |    5 +-
 plugins/fileroller/file-roller-plugin.cc           |    3 +-
 po/POTFILES.in                                     |    3 +-
 po/cs.po                                           |  788 +++----
 po/de.po                                           |  636 +++---
 po/es.po                                           |  844 ++++----
 po/nl.po                                           |    6 +-
 po/sl.po                                           |  901 ++++----
 src/Makefile.am                                    |    4 +-
 src/dialogs/Makefile.am                            |    3 +-
 src/dialogs/gnome-cmd-advrename-dialog.cc          |    2 +
 src/dialogs/gnome-cmd-edit-bookmark-dialog.cc      |    4 +-
 src/{ => dialogs}/gnome-cmd-remote-dialog.cc       |  114 +-
 src/{ => dialogs}/gnome-cmd-remote-dialog.h        |   14 +-
 src/dialogs/gnome-cmd-search-dialog.cc             |    8 +-
 src/gnome-cmd-chmod-dialog.cc                      |    3 +-
 src/gnome-cmd-chown-component.cc                   |    4 +-
 src/gnome-cmd-con-dialog.cc                        |  156 +-
 src/gnome-cmd-con-ftp.cc                           |    2 +-
 src/gnome-cmd-con-list.cc                          |  199 +-
 src/gnome-cmd-con-list.h                           |   56 +-
 src/gnome-cmd-con.cc                               |   21 +-
 src/gnome-cmd-con.h                                |   10 +-
 src/gnome-cmd-data.cc                              |  126 +-
 src/gnome-cmd-data.h                               |    3 +-
 src/gnome-cmd-dir.cc                               |    1 -
 src/gnome-cmd-file-list.cc                         |   56 +-
 src/gnome-cmd-file-list.h                          |    1 -
 src/gnome-cmd-file-selector.cc                     |    9 +-
 src/gnome-cmd-main-win.cc                          |   45 +-
 src/gnome-cmd-main-win.h                           |    2 +
 src/gnome-cmd-options-dialog.cc                    |   72 +-
 src/gnome-cmd-prepare-copy-dialog.cc               |    1 -
 src/gnome-cmd-prepare-move-dialog.cc               |    1 -
 src/gnome-cmd-prepare-xfer-dialog.cc               |    2 -
 src/gnome-cmd-selection-profile-component.cc       |   11 +-
 src/gnome-cmd-selection-profile-component.h        |    4 +-
 src/gnome-cmd-smb-auth.cc                          |   66 -
 src/gnome-cmd-smb-auth.h                           |   26 -
 src/gnome-cmd-user-actions.cc                      |   21 +-
 src/gnome-cmd-user-actions.h                       |    1 +
 src/gnome-cmd-xml-config.cc                        |   54 +-
 src/main.cc                                        |    6 +-
 src/utils.cc                                       |    2 +-
 64 files changed, 4631 insertions(+), 4866 deletions(-)
---
diff --cc src/gnome-cmd-user-actions.h
index ebb49a5,1be70cd..e010d81
--- a/src/gnome-cmd-user-actions.h
+++ b/src/gnome-cmd-user-actions.h
@@@ -282,8 -282,8 +282,9 @@@ GNOME_CMD_USER_ACTION(view_conbuttons)
  GNOME_CMD_USER_ACTION(view_concombo);
  GNOME_CMD_USER_ACTION(view_toolbar);
  GNOME_CMD_USER_ACTION(view_buttonbar);
 +GNOME_CMD_USER_ACTION(view_treeview);
  GNOME_CMD_USER_ACTION(view_cmdline);
+ GNOME_CMD_USER_ACTION(view_dir_history);
  GNOME_CMD_USER_ACTION(view_hidden_files);
  GNOME_CMD_USER_ACTION(view_backup_files);
  GNOME_CMD_USER_ACTION(view_up);