Skip to content

Commit 801020c

Browse files
authored
Merge pull request #127 from CodeDead/feature/large-crowd-sound
feat: added a large crowd sound and fixed a mediaKey property
2 parents c8b3d30 + ef1b62c commit 801020c

12 files changed

+19
-5
lines changed
1.41 MB
Binary file not shown.

src/main/resources/translations/OpalApplication.properties

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ PlayPause=Play / Pause
100100
PlayPauseError=Unable to play / pause!
101101
Dolphins=Dolphins
102102
RollerCoaster=Roller coaster
103+
LargeCrowd=Large crowd

src/main/resources/translations/OpalApplication_de_DE.properties

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ PlayPause=Abspielen / Pause
100100
PlayPauseError=Abspielen / Pause konnte nicht ausgeführt werden!
101101
Dolphins=Delfine
102102
RollerCoaster=Achterbahn
103+
LargeCrowd=Große Menschenmenge

src/main/resources/translations/OpalApplication_es_ES.properties

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ PlayPause=Reproducir / Pausa
100100
PlayPauseError=¡No se puede reproducir / pausar el sonido!
101101
Dolphins=Delfines
102102
RollerCoaster=Montaña rusa
103+
LargeCrowd=Multitud grande

src/main/resources/translations/OpalApplication_fr_FR.properties

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ PlayPause=Lecture / Pause
100100
PlayPauseError=Impossible de lire / mettre en pause!
101101
Dolphins=Dauphins
102102
RollerCoaster=Montagnes russes
103+
LargeCrowd=Grande foule

src/main/resources/translations/OpalApplication_hi_IN.properties

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ PlayPause=चालू करे रोके
100100
PlayPauseError=चलाने/रोकने में असमर्थ!
101101
Dolphins=डाल्फिन
102102
RollerCoaster=रोलर कोस्टर
103+
LargeCrowd=बड़ी भीड़

src/main/resources/translations/OpalApplication_jp_JP.properties

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ PlayPause=再生/一時停止
100100
PlayPauseError=再生/一時停止できません!
101101
Dolphins=イルカ
102102
RollerCoaster=ローラーコースター
103+
LargeCrowd=大観衆

src/main/resources/translations/OpalApplication_nl_NL.properties

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ PlayPause=Afspelen / Pauzeren
100100
PlayPauseError=Kan niet afspelen / pauzeren!
101101
Dolphins=Dolfijnen
102102
RollerCoaster=Achtbaan
103+
LargeCrowd=Grote menigte

src/main/resources/translations/OpalApplication_ru_RU.properties

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ PlayPause=Воспроизведение / Пауза
100100
PlayPauseError=Невозможно воспроизвести / приостановить воспроизведение!
101101
Dolphins=Дельфины
102102
RollerCoaster=Американские горки
103+
LargeCrowd=Большая толпа

src/main/resources/translations/OpalApplication_tr_TR.properties

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ PlayPause=Oynat / Duraklat
100100
PlayPauseError=Oynatma / Duraklatma düğmesi oluşturulamıyor!
101101
Dolphins=Yunuslar
102102
RollerCoaster=Lunapark treni
103+
LargeCrowd=Kalabalık

src/main/resources/translations/OpalApplication_zh_CN.properties

+1
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,4 @@ PlayPause=播放 / 暂停
100100
PlayPauseError=无法播放 / 暂停!
101101
Dolphins=海豚
102102
RollerCoaster=过山车
103+
LargeCrowd=大群众

src/main/resources/windows/MainWindow.fxml

+9-5
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@
319319
<RowConstraints vgrow="ALWAYS"/>
320320
<RowConstraints vgrow="ALWAYS"/>
321321
<RowConstraints vgrow="ALWAYS"/>
322+
<RowConstraints vgrow="ALWAYS"/>
322323
</rowConstraints>
323324

324325
<columnConstraints>
@@ -328,16 +329,19 @@
328329
<SoundPane GridPane.rowIndex="0" name="%NetworkingEvent"
329330
mediaKey="networking" mediaPath="/audio/networking.mp3"
330331
image="/images/networking.png"/>
331-
<SoundPane GridPane.rowIndex="1" name="%Restaurant"
332+
<SoundPane GridPane.rowIndex="1" name="%LargeCrowd"
333+
mediaKey="largeCrowd" mediaPath="/audio/largeCrowd.mp3"
334+
image="/images/group.png"/>
335+
<SoundPane GridPane.rowIndex="2" name="%Restaurant"
332336
mediaKey="restaurant" mediaPath="/audio/restaurant.mp3"
333337
image="/images/restaurant.png"/>
334-
<SoundPane GridPane.rowIndex="2" name="%TribalFestival"
338+
<SoundPane GridPane.rowIndex="3" name="%TribalFestival"
335339
mediaKey="tribal" mediaPath="/audio/tribal.mp3"
336340
image="/images/tribal.png"/>
337-
<SoundPane GridPane.rowIndex="3" name="%DrumTribalFestival"
341+
<SoundPane GridPane.rowIndex="4" name="%DrumTribalFestival"
338342
mediaKey="drumtribal" mediaPath="/audio/tribal2.mp3"
339343
image="/images/tribal2.png"/>
340-
<SoundPane GridPane.rowIndex="4" name="%RugbyFootball"
344+
<SoundPane GridPane.rowIndex="5" name="%RugbyFootball"
341345
mediaKey="rugbyfootball" mediaPath="/audio/football.mp3"
342346
image="/images/rugbyfootball.png"/>
343347
</GridPane>
@@ -432,7 +436,7 @@
432436
mediaKey="sleepy" mediaPath="/audio/sleepy.mp3"
433437
image="/images/sleepy.png"/>
434438
<SoundPane GridPane.rowIndex="3" name="%RollerCoaster"
435-
mediaKey="train" mediaPath="/audio/rollercoaster.mp3"
439+
mediaKey="rollerCoaster" mediaPath="/audio/rollercoaster.mp3"
436440
image="/images/train.png"/>
437441
<SoundPane GridPane.rowIndex="4" name="%Gong"
438442
mediaKey="gong" mediaPath="/audio/gong.mp3"

0 commit comments

Comments
 (0)