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

[Piotr Eljasiak <epiotr src gnome org>]

commit fc141194961b64d4af315fa515e1534372a039be
Merge: 6e57afb e708d33
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sat Dec 18 23:46:59 2010 +0100

    Merge branch 'master' into treeview

 AUTHORS                                          |    2 +-
 NEWS                                             |   14 +
 doc/C/gnome-commander.xml                        |  168 +-
 doc/de/de.po                                     | 6047 ++++++++++----------
 doc/es/es.po                                     | 6469 ++++++++++++----------
 doc/fr/fr.po                                     | 6075 ++++++++++----------
 doc/gnome-commander.1                            |    4 +-
 doc/keys.txt                                     |    1 -
 po/POTFILES.in                                   |    2 +-
 po/cs.po                                         |  825 ++--
 po/de.po                                         | 1159 ++--
 po/es.po                                         |  903 ++--
 po/eu.po                                         |  619 ++-
 po/fr.po                                         |  638 ++--
 po/sl.po                                         |  906 ++--
 po/zh_CN.po                                      | 4060 +++++++-------
 src/Makefile.am                                  |    1 -
 src/dialogs/Makefile.am                          |    1 +
 src/dialogs/gnome-cmd-advrename-dialog.cc        |   24 +-
 src/dialogs/gnome-cmd-key-shortcuts-dialog.cc    |    4 +-
 src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc |    3 +-
 src/dialogs/gnome-cmd-mkdir-dialog.cc            |  235 +
 src/dialogs/gnome-cmd-mkdir-dialog.h             |   28 +
 src/dirlist.cc                                   |   16 +-
 src/gnome-cmd-advrename-lexer.ll                 |    2 +-
 src/gnome-cmd-chmod-dialog.cc                    |    2 +-
 src/gnome-cmd-chown-dialog.cc                    |    2 +-
 src/gnome-cmd-clist.cc                           |    7 +-
 src/gnome-cmd-cmdline.cc                         |    2 +-
 src/gnome-cmd-con.cc                             |    4 +-
 src/gnome-cmd-data.cc                            |   13 +-
 src/gnome-cmd-data.h                             |    7 +
 src/gnome-cmd-dir-indicator.cc                   |    2 +-
 src/gnome-cmd-dir.cc                             |   20 +-
 src/gnome-cmd-dir.h                              |   22 +-
 src/gnome-cmd-file-collection.cc                 |    6 +-
 src/gnome-cmd-file-list.cc                       |  102 +-
 src/gnome-cmd-file-popmenu.cc                    |   14 +-
 src/gnome-cmd-file-props-dialog.cc               |   20 +-
 src/gnome-cmd-file-selector.cc                   |   40 +-
 src/gnome-cmd-file.cc                            |  272 +-
 src/gnome-cmd-file.h                             |  118 +-
 src/gnome-cmd-list-popmenu.cc                    |    4 +-
 src/gnome-cmd-main-win.cc                        |   16 +-
 src/gnome-cmd-make-copy-dialog.cc                |    6 +-
 src/gnome-cmd-mkdir-dialog.cc                    |  235 -
 src/gnome-cmd-mkdir-dialog.h                     |   55 -
 src/gnome-cmd-options-dialog.cc                  |   19 +
 src/gnome-cmd-prepare-xfer-dialog.cc             |   10 +-
 src/gnome-cmd-profile-component.cc               |   11 +-
 src/gnome-cmd-python-plugin.cc                   |    2 +-
 src/gnome-cmd-quicksearch-popup.cc               |    6 +-
 src/gnome-cmd-rename-dialog.cc                   |   13 +-
 src/gnome-cmd-search-dialog.cc                   |   12 +-
 src/gnome-cmd-smb-net.cc                         |    3 +-
 src/gnome-cmd-user-actions.cc                    |  127 +-
 src/gnome-cmd-user-actions.h                     |    2 +
 src/gnome-cmd-xfer.cc                            |    2 +-
 src/imageloader.cc                               |   10 +-
 src/intviewer/viewer-window.cc                   |    2 +-
 src/ls_colors.cc                                 |    2 +-
 src/main.cc                                      |    3 +
 src/plugin_manager.cc                            |    6 +-
 src/tags/gnome-cmd-tags-doc.cc                   |    2 +-
 src/tags/gnome-cmd-tags-exiv2.cc                 |    2 +-
 src/tags/gnome-cmd-tags-file.cc                  |    2 +-
 src/tags/gnome-cmd-tags-poppler.cc               |    2 +-
 src/tags/gnome-cmd-tags-taglib.cc                |    2 +-
 src/tags/gnome-cmd-tags.cc                       |    2 +-
 src/utils.cc                                     |  100 +-
 src/utils.h                                      |   11 +-
 71 files changed, 14976 insertions(+), 14552 deletions(-)
---
diff --cc po/POTFILES.in
index 9fcdf93,3677348..736ea7d
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -14,10 -14,9 +14,11 @@@ src/dialogs/gnome-cmd-edit-profile-dial
  src/dialogs/gnome-cmd-key-shortcuts-dialog.cc
  src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
  src/dialogs/gnome-cmd-manage-profiles-dialog.cc
+ src/dialogs/gnome-cmd-mkdir-dialog.cc
  src/dirlist.cc
  src/eggcellrendererkeys.cc
 +src/foldview/gnome-cmd-foldview-control.cc
 +src/foldview/gnome-cmd-foldview-view.cc
  src/gnome-cmd-about-plugin.cc
  src/gnome-cmd-chmod-component.cc
  src/gnome-cmd-chmod-dialog.cc