[gnome-commander/57-remote-connections-gnome-commander-misreads-file-ownership: 4/4] Merge branch 'master' into '57-remote-connections-gnome-commander-misreads-file-ownership'

[Uwe Scholz <uwescholz src gnome org>]

commit 58c8a87f276f1857fd332e32532b2401a572d5c8
Merge: e87ee33d b527a6cd
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Tue Nov 23 20:35:40 2021 +0000

    Merge branch 'master' into '57-remote-connections-gnome-commander-misreads-file-ownership'
    
    # Conflicts:
    #   NEWS
    #   doc/C/releases.xml

 NEWS                                   |   1 +
 doc/C/releases.xml                     |   3 +
 src/dialogs/gnome-cmd-delete-dialog.cc | 195 +++++++++++++++++----------------
 src/intviewer/viewer-utils.cc          |  37 +++----
 src/intviewer/viewer-utils.h           |   2 +-
 5 files changed, 120 insertions(+), 118 deletions(-)
---
diff --cc NEWS
index cbbae189,f9047003..17f2f2b2
--- a/NEWS
+++ b/NEWS
@@@ -17,7 -17,7 +17,8 @@@ Bug fixes
   * Fixed issue #47 (Duplicate directory when copying over an existing directory)
   * Fixed issue #51 (Move and not copy by default on same filesystem)
   * Fixed issue #52 (Auto refresh when changing permissions etc)
 + * Fixed issue #57 (Remote connections: Gnome Commander misreads file ownership)
+  * Fixed issue #59 (On ssh connection, to delete a renamed folder/file don't work)
   * Fixed issue #74 (Does not show mounted external drives)
   * Fixed issue #75 (Newly inserted DVD does not show up)
  
diff --cc doc/C/releases.xml
index 61d1a5cc,fd6fc74b..d1927b53
--- a/doc/C/releases.xml
+++ b/doc/C/releases.xml
@@@ -63,8 -63,8 +63,11 @@@
                              <para>Fixed issue #52 (Auto refresh when changing permissions etc)</para>
                          </listitem>
                          <listitem>
 +                            <para>Fixed issue #57 (Remote connections: Gnome Commander misreads file 
ownership)</para>
 +                        </listitem>
++                        <listitem>
+                             <para>Fixed issue #59 (On ssh connection, to delete a renamed folder/file don't 
work)</para>
+                         </listitem>
                          <listitem>
                              <para>Fixed issue #74 (Does not show mounted external drives)</para>
                          </listitem>