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

[Piotr Eljasiak <epiotr src gnome org>]

commit 65cec363db2a5732b4a6923a4ae475013aa9c117
Merge: e02c09a 02026b5
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sat Sep 18 17:34:29 2010 +0200

    Merge branch 'master' into treeview

 NEWS                                               |    1 +
 data/gnome-commander.spec.in                       |    4 +
 doc/C/gnome-commander.xml                          |    7 +-
 doc/es/es.po                                       | 6077 ++++++++++----------
 po/POTFILES.in                                     |    4 +-
 po/de.po                                           |  663 ++--
 po/es.po                                           |  658 ++--
 po/fr.po                                           |  645 ++-
 po/sl.po                                           |  768 ++--
 po/uk.po                                           | 1548 +++---
 src/Makefile.am                                    |    2 -
 src/dialogs/Makefile.am                            |    2 +
 src/{ => dialogs}/gnome-cmd-advrename-dialog.cc    |   16 +-
 src/{ => dialogs}/gnome-cmd-advrename-dialog.h     |    0
 .../gnome-cmd-key-shortcuts-dialog.cc              |    0
 src/{ => dialogs}/gnome-cmd-key-shortcuts-dialog.h |    0
 src/gnome-cmd-chmod-dialog.cc                      |    2 +-
 src/gnome-cmd-chown-dialog.cc                      |    2 +-
 src/gnome-cmd-con-smb.cc                           |    9 +-
 src/gnome-cmd-data.cc                              |    4 +-
 src/gnome-cmd-file-props-dialog.cc                 |    6 +-
 src/gnome-cmd-file-selector.cc                     |    4 +
 src/gnome-cmd-file.cc                              |   57 +-
 src/gnome-cmd-file.h                               |    8 +-
 src/gnome-cmd-main-win.h                           |    2 +-
 src/gnome-cmd-options-dialog.cc                    |    9 +
 src/gnome-cmd-rename-dialog.cc                     |    2 +-
 src/gnome-cmd-user-actions.cc                      |   55 +-
 src/gnome-cmd-xfer.cc                              |   76 +-
 src/gnome-cmd-xml-config.cc                        |    2 +-
 src/utils.cc                                       |    2 +-
 31 files changed, 5348 insertions(+), 5287 deletions(-)
---
diff --cc po/POTFILES.in
index 3379f14,a28339a..c1dbebd
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -35,9 -36,6 +36,8 @@@ src/gnome-cmd-file-popmenu.c
  src/gnome-cmd-file-props-dialog.cc
  src/gnome-cmd-file-selector.cc
  src/gnome-cmd-file.cc
 +src/gnome-cmd-foldview-control.cc
 +src/gnome-cmd-foldview-view.cc
- src/gnome-cmd-key-shortcuts-dialog.cc
  src/gnome-cmd-list-popmenu.cc
  src/gnome-cmd-main-menu.cc
  src/gnome-cmd-main-win.cc
diff --cc src/Makefile.am
index 500c510,0ccf5e4..1ce6c60
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -49,16 -48,8 +48,15 @@@ gnome_commander_SOURCES = 
  	gnome-cmd-file-props-dialog.h gnome-cmd-file-props-dialog.cc \
  	gnome-cmd-file-selector.h gnome-cmd-file-selector.cc \
  	gnome-cmd-file.h gnome-cmd-file.cc \
 +	gnome-cmd-foldview.h \
 +	gnome-cmd-foldview-control.cc \
 +	gnome-cmd-foldview-gvfs.h gnome-cmd-foldview-gvfs.cc \
 +	gnome-cmd-foldview-model.cc \
 +	gnome-cmd-foldview-private.h  gnome-cmd-foldview.cc \
 +	gnome-cmd-foldview-treestore.h gnome-cmd-foldview-treestore.cc \
 +	gnome-cmd-foldview-view.cc \
  	gnome-cmd-hintbox.h gnome-cmd-hintbox.cc \
  	gnome-cmd-includes.h \
- 	gnome-cmd-key-shortcuts-dialog.h gnome-cmd-key-shortcuts-dialog.cc \
  	gnome-cmd-list-popmenu.h gnome-cmd-list-popmenu.cc \
  	gnome-cmd-main-menu.h gnome-cmd-main-menu.cc \
  	gnome-cmd-main-win.h gnome-cmd-main-win.cc \