[gtk: 2/2] Merge branch 'nls' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit 6030da573d0a7e43eb5edac56fdf04d8577ba333
Merge: 0128574ca1 bcd0704511
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Mar 31 17:07:37 2022 +0000

    Merge branch 'nls' into 'main'
    
    Remove #ifdef ENABLE_NLS
    
    See merge request GNOME/gtk!4606

 gdk/gdkintl.h           | 8 ++------
 gtk/gtkintl.h           | 6 +-----
 gtk/gtkmain.c           | 4 +---
 tools/encodesymbolic.c  | 2 --
 tools/gtk-launch.c      | 2 --
 tools/updateiconcache.c | 2 --
 6 files changed, 4 insertions(+), 20 deletions(-)
---