[gtk/wip/jimmac/error-labels-insensitive-gtk3: 5/5] Merge branch 'gtk-3-24' into 'wip/jimmac/error-labels-insensitive-gtk3'

[Jakub Steiner <jimmac src gnome org>]

commit 6a97b1ff2713c94b47e7c94f9c653eccad8e0c88
Merge: 72513972d7 1ce4f4c514
Author: Jakub Steiner <jimmac gmail com>
Date:   Tue Aug 18 10:35:38 2020 +0000

    Merge branch 'gtk-3-24' into 'wip/jimmac/error-labels-insensitive-gtk3'
    
    # Conflicts:
    #   gtk/theme/Adwaita/_common.scss
    #   gtk/theme/Adwaita/gtk-contained-dark.css
    #   gtk/theme/Adwaita/gtk-contained.css

 po/ja.po | 342 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 171 insertions(+), 171 deletions(-)
---