[nautilus: 2/2] Merge branch 'my_work' into 'master'

[Carlos Soriano <csoriano src gnome org>]

commit 82beadcce30a29f7a8d0802fcd22d76380ecf4b0
Merge: eed53461d 382d8e19b
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Wed Jan 24 15:41:12 2018 +0000

    Merge branch 'my_work' into 'master'
    
    general: Provide translator context for "Sort"
    
    Closes #151
    
    See merge request GNOME/nautilus!63

 src/resources/ui/nautilus-preferences-window.ui | 2 +-
 src/resources/ui/nautilus-toolbar-view-menu.ui  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---