[gnome-user-docs: 13/13] Merge branch 'gnome-3-0'

[Shaun McCance <shaunm src gnome org>]

commit 4ab91ae239f5c41b89896b17ab3b62185b4c496c
Merge: a9d61d1 8f46f17
Author: Shaun McCance <shaunm gnome org>
Date:   Mon May 23 12:39:26 2011 -0400

    Merge branch 'gnome-3-0'
    
    Conflicts:
    	gnome-help/Makefile.am
    	gnome-help/es/es.po

 gnome-help/C/sound-alert.page              |    5 +-
 gnome-help/C/sound-broken.page             |    2 +-
 gnome-help/C/sound-crackle.page            |    2 +-
 gnome-help/C/sound-nosound.page            |    2 +-
 gnome-help/C/sound-usemic.page             |    2 +-
 gnome-help/C/sound-usespeakers.page        |    2 +-
 gnome-help/C/sound-volume.page             |   20 +-
 gnome-help/C/tips-specialchars.page        |    2 +-
 gnome-help/C/tips.page                     |    2 +-
 gnome-help/Makefile.am                     |    2 +-
 gnome-help/es/figures/nautilus.png         |  Bin 0 -> 79859 bytes
 gnome-help/es/figures/printing-select.png  |  Bin 0 -> 7207 bytes
 gnome-help/es/figures/shell-activities.png |  Bin 0 -> 4218 bytes
 gnome-help/es/figures/shell-appts.png      |  Bin 0 -> 63712 bytes
 gnome-help/es/figures/shell-dash.png       |  Bin 0 -> 24126 bytes
 gnome-help/es/figures/shell-exit.png       |  Bin 0 -> 33394 bytes
 gnome-help/es/figures/shell-files.png      |  Bin 0 -> 13558 bytes
 gnome-help/es/figures/shell-top-bar.png    |  Bin 0 -> 15084 bytes
 gnome-help/es/figures/shell-windows.png    |  Bin 0 -> 40374 bytes
 gnome-help/es/figures/shell-workspaces.png |  Bin 0 -> 105081 bytes
 gnome-help/vi/vi.po                        |14872 ++++++++++++++++++++++++++++
 21 files changed, 14898 insertions(+), 15 deletions(-)
---
diff --cc gnome-help/Makefile.am
index 293cd0f,40118a7..674a6d6
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@@ -1,10 -1,10 +1,10 @@@
 -include $(top_srcdir)/gnome-doc-utils.make
 + YELP_HELP_RULES@
  
 -DOC_ID = gnome-help
 +HELP_ID = gnome-help
  
- HELP_LINGUAS = de fi es gl hi sl sv
 -DOC_LINGUAS = de fi es gl hi sl sv vi
++HELP_LINGUAS = de fi es gl hi sl sv vi
  
 -DOC_FIGURES = \
 +HELP_MEDIA = \
  	figures/gnome.png \
  	figures/gnome-searchtool.png \
  	figures/nautilus.png \