[gnome-dictionary/wip/jimmac/app-icon-redesign: 59/59] Merge branch 'master' into 'wip/jimmac/app-icon-redesign'

[Kalev Lember <klember src gnome org>]

commit df1274b69d998c778b195ba8b1401b8327567848
Merge: 354d4fa f118cae
Author: Kalev Lember <klember redhat com>
Date:   Fri Nov 8 14:14:49 2019 +0000

    Merge branch 'master' into 'wip/jimmac/app-icon-redesign'
    
    # Conflicts:
    #   data/org.gnome.Dictionary.desktop.in

 data/default.desktop.in                   |   2 +-
 data/gnome-dictionary-appdata.png         | Bin 34677 -> 27989 bytes
 data/org.gnome.Dictionary.appdata.xml.in  |  33 +-
 data/org.gnome.Dictionary.desktop.in      |   3 +-
 help/C/figures/gnome-dictionary-3-26.png  | Bin 0 -> 4728 bytes
 help/C/figures/gnome-dictionary.png       | Bin 14635 -> 0 bytes
 help/C/introduction.page                  |   2 +-
 help/C/keyboard-shortcuts.page            |  10 +-
 help/cs/cs.po                             |  10 +-
 help/de/de.po                             |  14 +-
 help/es/es.po                             |  53 ++-
 help/fr/fr.po                             |  31 +-
 help/hu/hu.po                             |  32 +-
 help/ko/ko.po                             |  25 +-
 help/meson.build                          |   2 +-
 help/pl/figures/gnome-dictionary-3-26.png | Bin 0 -> 38120 bytes
 help/pl/figures/gnome-dictionary.png      | Bin 25465 -> 0 bytes
 help/pl/pl.po                             |  22 +-
 help/pt_BR/pt_BR.po                       |  50 +--
 help/sv/sv.po                             |  22 +-
 po/LINGUAS                                |   1 +
 po/ca.po                                  | 115 ++---
 po/cs.po                                  | 107 +++--
 po/da.po                                  | 122 +++---
 po/de.po                                  | 118 ++---
 po/el.po                                  | 119 ++---
 po/en_GB.po                               | 697 ++++++++++++++++--------------
 po/es.po                                  | 123 +++---
 po/eu.po                                  | 195 ++++-----
 po/fa.po                                  | 303 +++++++------
 po/fi.po                                  | 118 ++---
 po/fr.po                                  |  84 ++--
 po/fur.po                                 | 119 ++---
 po/gl.po                                  | 128 +++---
 po/hr.po                                  |  77 ++--
 po/hu.po                                  | 326 +++-----------
 po/id.po                                  | 136 +++---
 po/is.po                                  | 635 ++++++++++++++-------------
 po/it.po                                  | 120 +++--
 po/ja.po                                  | 682 +++++++++++++++--------------
 po/kk.po                                  | 118 ++---
 po/ko.po                                  | 139 +++---
 po/lt.po                                  | 122 +++---
 po/lv.po                                  | 131 +++---
 po/mjw.po                                 | 633 +++++++++++++++++++++++++++
 po/nl.po                                  | 122 +++---
 po/pl.po                                  | 117 +++--
 po/pt_BR.po                               | 130 +++---
 po/ro.po                                  |  84 ++--
 po/ru.po                                  | 120 ++---
 po/sl.po                                  | 555 ++++++++++++------------
 po/sr.po                                  | 129 +++---
 po/sv.po                                  | 122 +++---
 po/tr.po                                  |  80 ++--
 po/zh_CN.po                               | 187 ++++----
 po/zh_TW.po                               | 129 +++---
 src/gdict-app-menus.ui                    |  42 +-
 src/gdict-window.c                        |   2 +-
 58 files changed, 4084 insertions(+), 3514 deletions(-)
---
diff --cc data/org.gnome.Dictionary.desktop.in
index 7fffec6,89fb849..3694979
--- a/data/org.gnome.Dictionary.desktop.in
+++ b/data/org.gnome.Dictionary.desktop.in
@@@ -5,8 -6,8 +6,8 @@@ Keywords=word;synonym;definition;spelli
  Exec=gnome-dictionary
  Terminal=false
  Type=Application
- # Translators: Do not translate the Icon key
+ # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 -Icon=accessories-dictionary
 +Icon=org.gnome.Dictionary
  StartupNotify=true
  Categories=GNOME;GTK;Office;Dictionary;
  NotShowIn=KDE;