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

[Piotr Eljasiak <epiotr src gnome org>]

commit 1fb81fd63341607b559279b4d9263efa37fec049
Merge: dbc0e40 346f1e7
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sun Oct 23 13:58:22 2011 +0200

    Merge branch 'master' into treeview

 AUTHORS                                            |    2 +
 NEWS                                               |    2 +-
 doc/C/releases.xml                                 |    2 +-
 doc/Makefile.am                                    |    2 +-
 doc/es/es.po                                       |24134 ++++++++++----------
 .../figures/gnome-commander_dialog_application.png |  Bin 0 -> 28136 bytes
 .../gnome-commander_dialog_file_metadata.png       |  Bin 0 -> 49677 bytes
 .../gnome-commander_dialog_file_permissions.png    |  Bin 0 -> 31044 bytes
 .../gnome-commander_dialog_file_properties.png     |  Bin 0 -> 39972 bytes
 doc/ru/figures/gnome-commander_dialog_search.png   |  Bin 0 -> 53887 bytes
 .../gnome-commander_options_confirmation.png       |  Bin 0 -> 35402 bytes
 doc/ru/figures/gnome-commander_options_devices.png |  Bin 0 -> 33269 bytes
 doc/ru/figures/gnome-commander_options_filters.png |  Bin 0 -> 35210 bytes
 doc/ru/figures/gnome-commander_options_format.png  |  Bin 0 -> 41319 bytes
 doc/ru/figures/gnome-commander_options_general.png |  Bin 0 -> 56695 bytes
 doc/ru/figures/gnome-commander_options_layout.png  |  Bin 0 -> 48707 bytes
 .../figures/gnome-commander_options_programs.png   |  Bin 0 -> 52892 bytes
 doc/ru/figures/gnome-commander_options_tabs.png    |  Bin 0 -> 26151 bytes
 doc/ru/ru.po                                       |12331 ++++++++++
 po/fr.po                                           |  792 +-
 po/ja.po                                           | 3368 ++--
 po/ru.po                                           | 2302 ++-
 src/gnome-cmd-con.h                                |    4 +-
 src/gnome-cmd-file-list.cc                         |    2 +-
 src/gnome-cmd-xml-config.cc                        |   13 +-
 25 files changed, 28218 insertions(+), 14736 deletions(-)
---