[gnome-user-docs/wip/mdh: 46/46] Merge branch 'master' into wip/mdh

[Petr Kovář <pmkovar src gnome org>]

commit 8da2865caa275cbdadabffc37658778f1fc05997
Merge: 1b6a3eaa b5a84f09
Author: Petr Kovar <pkovar redhat com>
Date:   Sat Sep 22 16:33:54 2018 -0700

    Merge branch 'master' into wip/mdh

 NEWS                                               |    13 +
 configure.ac                                       |     2 +-
 gnome-help/C/app-fspot.page.stub                   |    25 -
 gnome-help/C/figures/printing-select.png           |   Bin 7633 -> 7908 bytes
 gnome-help/C/figures/shell-appmenu-shell.png       |   Bin 80537 -> 92763 bytes
 gnome-help/C/figures/shell-appts.png               |   Bin 159267 -> 132589 bytes
 gnome-help/C/figures/shell-dash.png                |   Bin 31228 -> 40516 bytes
 gnome-help/C/figures/shell-exit.png                |   Bin 139241 -> 133892 bytes
 gnome-help/C/keyboard-shortcuts-set.page           |    15 +-
 gnome-help/C/shell-introduction.page               |     3 +-
 gnome-help/C/shell-keyboard-shortcuts.page         |    10 +-
 gnome-help/C/shell-lockscreen.page                 |     3 +-
 gnome-help/ca/ca.po                                |   726 +-
 gnome-help/cs/cs.po                                |  1657 +-
 gnome-help/de/de.po                                | 21555 ++++++++++-------
 gnome-help/gl/gl.po                                | 23124 +++++++++++--------
 gnome-help/pl/pl.po                                |  1454 +-
 .../pt_BR/figures/input-methods-switcher.png       |   Bin 28848 -> 45878 bytes
 gnome-help/pt_BR/figures/nautilus-icons.png        |   Bin 0 -> 18859 bytes
 gnome-help/pt_BR/figures/printing-select.png       |   Bin 8401 -> 12378 bytes
 .../pt_BR/figures/shell-activities-classic.png     |   Bin 0 -> 6547 bytes
 gnome-help/pt_BR/figures/shell-activities.png      |   Bin 9289 -> 7911 bytes
 gnome-help/pt_BR/figures/shell-appmenu-classic.png |   Bin 0 -> 20826 bytes
 gnome-help/pt_BR/figures/shell-appmenu-shell.png   |   Bin 0 -> 98335 bytes
 gnome-help/pt_BR/figures/shell-appts.png           |   Bin 112366 -> 114221 bytes
 gnome-help/pt_BR/figures/shell-dash.png            |   Bin 19092 -> 34266 bytes
 gnome-help/pt_BR/figures/shell-exit-classic.png    |   Bin 39626 -> 33464 bytes
 gnome-help/pt_BR/figures/shell-exit.png            |   Bin 207841 -> 112466 bytes
 gnome-help/pt_BR/figures/shell-top-bar-classic.png |   Bin 15370 -> 21886 bytes
 gnome-help/pt_BR/figures/shell-top-bar.png         |   Bin 49259 -> 47457 bytes
 .../pt_BR/figures/shell-window-list-classic.png    |   Bin 16685 -> 11708 bytes
 gnome-help/pt_BR/figures/shell-workspaces.png      |   Bin 31017 -> 42932 bytes
 gnome-help/pt_BR/figures/top-bar-icons-classic.png |   Bin 9052 -> 8699 bytes
 gnome-help/pt_BR/figures/top-bar-icons.png         |   Bin 6114 -> 7444 bytes
 gnome-help/pt_BR/pt_BR.po                          |  1683 +-
 gnome-help/sv/sv.po                                |  1465 +-
 system-admin-guide/es/es.po                        |   293 +-
 37 files changed, 30838 insertions(+), 21190 deletions(-)
---
diff --cc gnome-help/C/keyboard-shortcuts-set.page
index c6c0935d,b18a729a..92878bf4
--- a/gnome-help/C/keyboard-shortcuts-set.page
+++ b/gnome-help/C/keyboard-shortcuts-set.page
@@@ -495,10 -487,12 +499,13 @@@
        command.</p>
      </item>
      <item>
 -      <p>Click <gui>Set Shortcut…</gui> and hold down the desired shortcut
 -      key combination.</p>
 +      <p>Click the row that was just added. When the
 +      <gui>Set Custom Shortcut</gui> window opens, hold down the desired
 +      shortcut key combination.</p>
      </item>
+     <item>
+       <p>Click <gui>Add</gui>.</p>
+     </item>
    </steps>
  
    <p>The command name that you type should be a valid system command. You can