gallery: fix a number of naming thinkos.

Change-Id: If5fe5af925bb2f8b7a5a11eb9d310668a3fd7085

10 files changed, 17 insertions, 17 deletions

diff --git a/extras/Gallery_arrows.mk b/extras/Gallery_arrows.mk
index 6bd51e8d92f6..99de5dbc3107 100644
--- a/extras/Gallery_arrows.mk
+++ b/extras/Gallery_arrows.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/arrows))
+$(eval $(call gb_Gallery_Gallery,arrows,extras/source/gallery/arrows))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/arrows,\
+$(eval $(call gb_Gallery_add_files,arrows,share/gallery/arrows,\
 	extras/source/gallery/arrows/A01-Arrow-Gray-Left.png \
 	extras/source/gallery/arrows/A02-Arrow-DarkBlue-Right.png \
 	extras/source/gallery/arrows/A03-Arrow-Gray-Left.png \
diff --git a/extras/Gallery_diagrams.mk b/extras/Gallery_diagrams.mk
index b4ca53a6dc83..bef5e96a9660 100644
--- a/extras/Gallery_diagrams.mk
+++ b/extras/Gallery_diagrams.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/diagrams))
+$(eval $(call gb_Gallery_Gallery,diagrams,extras/source/gallery/diagrams))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/diagrams,\
+$(eval $(call gb_Gallery_add_files,diagrams,share/gallery/diagrams,\
 	extras/source/gallery/diagrams/Component-Circle01-Transparent-DarkBlue.png \
 	extras/source/gallery/diagrams/Component-Circle02-Transparent-Bule.png \
 	extras/source/gallery/diagrams/Component-Circle03-Transparent-Green.png \
diff --git a/extras/Gallery_education.mk b/extras/Gallery_education.mk
index 1e90ae630b19..a069589e948a 100644
--- a/extras/Gallery_education.mk
+++ b/extras/Gallery_education.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/education))
+$(eval $(call gb_Gallery_Gallery,education,extras/source/gallery/education))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/education,\
+$(eval $(call gb_Gallery_add_files,education,share/gallery/education,\
 	extras/source/gallery/education/Blackboard.png \
 	extras/source/gallery/education/Books.png \
 	extras/source/gallery/education/Chalk.png \
diff --git a/extras/Gallery_environment.mk b/extras/Gallery_environment.mk
index 154e4a8dbb28..16b4be29ccdc 100644
--- a/extras/Gallery_environment.mk
+++ b/extras/Gallery_environment.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/environment))
+$(eval $(call gb_Gallery_Gallery,environment,extras/source/gallery/environment))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/environment,\
+$(eval $(call gb_Gallery_add_files,environment,share/gallery/environment,\
 	extras/source/gallery/environment/DrippingFaucet.png \
 	extras/source/gallery/environment/Earth.png \
 	extras/source/gallery/environment/EndangeredAnimals1.png \
diff --git a/extras/Gallery_finance.mk b/extras/Gallery_finance.mk
index cf7c9919d0f6..c53d0d715b18 100644
--- a/extras/Gallery_finance.mk
+++ b/extras/Gallery_finance.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/finance))
+$(eval $(call gb_Gallery_Gallery,finance,extras/source/gallery/finance))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/finance,\
+$(eval $(call gb_Gallery_add_files,finance,share/gallery/finance,\
 	extras/source/gallery/finance/Agreement.png \
 	extras/source/gallery/finance/ATM01.png \
 	extras/source/gallery/finance/ATM02.png \
diff --git a/extras/Gallery_people.mk b/extras/Gallery_people.mk
index b42c4122ad5c..41adf78c6832 100644
--- a/extras/Gallery_people.mk
+++ b/extras/Gallery_people.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/people))
+$(eval $(call gb_Gallery_Gallery,people,extras/source/gallery/people))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/people,\
+$(eval $(call gb_Gallery_add_files,people,share/gallery/people,\
 	extras/source/gallery/people/Artist-Female1.png \
 	extras/source/gallery/people/Artist-Female2.png \
 	extras/source/gallery/people/Artist-Male1.png \
diff --git a/extras/Gallery_sound.mk b/extras/Gallery_sound.mk
index b48a2f05d392..1243b0cb2946 100644
--- a/extras/Gallery_sound.mk
+++ b/extras/Gallery_sound.mk
@@ -8,9 +8,9 @@
 #
 # this should probably be done with more general rules: but how ?
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/sounds))
+$(eval $(call gb_Gallery_Gallery,sounds,extras/source/gallery/sounds))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/sounds,\
+$(eval $(call gb_Gallery_add_files,sounds,share/gallery/sounds,\
 	extras/source/gallery/sounds/apert2.wav \
 	extras/source/gallery/sounds/apert.wav \
 	extras/source/gallery/sounds/applause.wav \
diff --git a/extras/Gallery_symbols.mk b/extras/Gallery_symbols.mk
index 2ca0bdb4bfec..43413f9dbbe2 100644
--- a/extras/Gallery_symbols.mk
+++ b/extras/Gallery_symbols.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/symbols))
+$(eval $(call gb_Gallery_Gallery,symbols,extras/source/gallery/symbols))
 
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/symbols,\
+$(eval $(call gb_Gallery_add_files,symbols,share/gallery/symbols,\
 	extras/source/gallery/symbols/Book.png \
 	extras/source/gallery/symbols/Box01.png \
 	extras/source/gallery/symbols/Box02.png \
diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf
index 6d8cd4569d8f..12d7769c46d5 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -28,7 +28,7 @@ en-US = "Finance"
 [people]
 en-US = "People"
 
-[sound]
+[sounds]
 en-US = "Sounds"
 
 [symbols]
diff --git a/extras/source/gallery/sounds/sound.str b/extras/source/gallery/sounds/sounds.str
index bae770e142d2..bae770e142d2 100644
--- a/extras/source/gallery/sounds/sound.str
+++ b/extras/source/gallery/sounds/sounds.str