[recipes: 2/3] Merge branch 'master' of gitlab.gnome.org:ekta/recipes

[Matthias Clasen <matthiasc src gnome org>]

commit 5ea3c053056e045850298e7b361b9558755a9855
Merge: 93faae0 8afa2a5
Author: Ekta Nandwani <mailnandwaniekta gmail com>
Date:   Thu Mar 1 17:37:41 2018 +0700

    Merge branch 'master' of gitlab.gnome.org:ekta/recipes

 data/ingredients.list  | 16 +++++++---------
 po/id.po               | 12 ++++++------
 src/gr-diet-row.c      |  5 +++++
 src/gr-diet.c          |  3 +++
 src/gr-diet.h          |  3 ++-
 src/gr-edit-page.c     |  9 +++++++--
 src/gr-edit-page.ui    |  7 +++++++
 src/gr-query-editor.c  |  5 +++++
 src/gr-recipe.c        |  1 +
 src/gr-shopping-page.c |  7 ++++++-
 10 files changed, 49 insertions(+), 19 deletions(-)
---