Merge branch 'master' into standardizeBooks

H-uru · Apr 2, 2024 · 77fe675 · 77fe675
2 parents 4a72674 + 376bc35
commit 77fe675
Show file tree

Hide file tree

Showing 48 changed files with 248 additions and 87 deletions.
diff --git a/compiled/dat/BahroCave_District_YeeshaCave.prp b/compiled/dat/BahroCave_District_YeeshaCave.prp
diff --git a/compiled/dat/CityEnglish.loc b/compiled/dat/CityEnglish.loc
@@ -1443,12 +1443,9 @@ And don't lose it. I could barely get it off the wall and when I did, it was pre
 </translation>
 			</element>
 			<element name="NickNote">
-				<translation language="English">
-
-Where the heck is my book? And why did someone take it in the first place!
-
-- Nick 
+				<translation language="English">Where the heck is my book? And why did someone take it in the first place!
 
+- Nick
 </translation>
 			</element>
 			<element name="WatsonLetter">

diff --git a/compiled/dat/CityFrench.loc b/compiled/dat/CityFrench.loc
@@ -1365,12 +1365,9 @@ Mais il ne faut pas le perdre. J'ai eu beaucoup de mal à l'enlever du mur, ce q
 </translation>
 			</element>
 			<element name="NickNote">
-				<translation language="French">
-
-Où est passé mon Livre ? Pourquoi quelqu'un l'a-t-il pris !
-
-- Nick 
+				<translation language="French">Où est passé mon Livre ? Pourquoi quelqu'un l'a-t-il pris !
 
+- Nick
 </translation>
 			</element>
 			<element name="WatsonLetter">

diff --git a/compiled/dat/CityGerman.loc b/compiled/dat/CityGerman.loc
@@ -1403,12 +1403,9 @@ Und verlier es nicht. Ich habe es kaum von der Wand bekommen und als ich es endl
 </translation>
 			</element>
 			<element name="NickNote">
-				<translation language="German">
-
-Wo zur Hölle ist mein Buch? Wer hat überhaupt etwas da dran zu suchen?!
-
-- Nick 
+				<translation language="German">Wo zur Hölle ist mein Buch? Wer hat überhaupt etwas da dran zu suchen?!
 
+- Nick
 </translation>
 			</element>
 			<element name="WatsonLetter">

diff --git a/compiled/dat/CityItalian.loc b/compiled/dat/CityItalian.loc
@@ -460,12 +460,9 @@ E non perderlo. Sono a malapena riuscito a staccarlo dal muro e, quando l'ho fat
 </translation>
 			</element>
 			<element name="NickNote">
-				<translation language="Italian">
-
-Dove diavolo è il mio libro? Ma soprattutto, perchè qualcuno l'ha preso?
-
-- Nick 
+				<translation language="Italian">Dove diavolo è il mio libro? Ma soprattutto, perchè qualcuno l'ha preso?
 
+- Nick
 </translation>
 			</element>
 			<element name="WatsonLetter">

diff --git a/compiled/dat/CitySpanish.loc b/compiled/dat/CitySpanish.loc
@@ -458,12 +458,9 @@ Y no lo pierdas. Me costó mucho retirarlo de la pared y cuando lo hice, me dio
 </translation>
 			</element>
 			<element name="NickNote">
-				<translation language="Spanish">
-
-¿Dónde demonios está mi libro? ¡¿Y por qué se lo tuvo que llevar alguien?!
-
-- Nick 
+				<translation language="Spanish">¿Dónde demonios está mi libro? ¡¿Y por qué se lo tuvo que llevar alguien?!
 
+- Nick
 </translation>
 			</element>
 			<element name="WatsonLetter">

diff --git a/compiled/dat/GUI_District_AdvancedGameSettingsDialog.prp b/compiled/dat/GUI_District_AdvancedGameSettingsDialog.prp
diff --git a/compiled/dat/GUI_District_AudioSettingsDialog.prp b/compiled/dat/GUI_District_AudioSettingsDialog.prp
diff --git a/compiled/dat/GUI_District_CalibrationGUI.prp b/compiled/dat/GUI_District_CalibrationGUI.prp
diff --git a/compiled/dat/GUI_District_ContactSupportGUI.prp b/compiled/dat/GUI_District_ContactSupportGUI.prp
diff --git a/compiled/dat/GUI_District_GraphicsSettingsDialog.prp b/compiled/dat/GUI_District_GraphicsSettingsDialog.prp
diff --git a/compiled/dat/GUI_District_KIAgeOwnerSettings.prp b/compiled/dat/GUI_District_KIAgeOwnerSettings.prp
diff --git a/compiled/dat/GUI_District_KIBlackBar.prp b/compiled/dat/GUI_District_KIBlackBar.prp
diff --git a/compiled/dat/GUI_District_KIHelp.prp b/compiled/dat/GUI_District_KIHelp.prp
diff --git a/compiled/dat/GUI_District_KIJournalExpanded.prp b/compiled/dat/GUI_District_KIJournalExpanded.prp
diff --git a/compiled/dat/GUI_District_KIListMode.prp b/compiled/dat/GUI_District_KIListMode.prp
diff --git a/compiled/dat/GUI_District_KIMain.prp b/compiled/dat/GUI_District_KIMain.prp
diff --git a/compiled/dat/GUI_District_KIMarkerFolder.prp b/compiled/dat/GUI_District_KIMarkerFolder.prp
diff --git a/compiled/dat/GUI_District_KIMicro.prp b/compiled/dat/GUI_District_KIMicro.prp
diff --git a/compiled/dat/GUI_District_KIMicroBlackBar.prp b/compiled/dat/GUI_District_KIMicroBlackBar.prp
diff --git a/compiled/dat/GUI_District_KIMini.prp b/compiled/dat/GUI_District_KIMini.prp
diff --git a/compiled/dat/GUI_District_KIMiniMarkers.prp b/compiled/dat/GUI_District_KIMiniMarkers.prp
diff --git a/compiled/dat/GUI_District_KINanoBlackBar.prp b/compiled/dat/GUI_District_KINanoBlackBar.prp
diff --git a/compiled/dat/GUI_District_KINewItemAlert.prp b/compiled/dat/GUI_District_KINewItemAlert.prp
diff --git a/compiled/dat/GUI_District_KIPictureExpanded.prp b/compiled/dat/GUI_District_KIPictureExpanded.prp
diff --git a/compiled/dat/GUI_District_KIPlayerExpanded.prp b/compiled/dat/GUI_District_KIPlayerExpanded.prp
diff --git a/compiled/dat/GUI_District_KIQuestionNote.prp b/compiled/dat/GUI_District_KIQuestionNote.prp
diff --git a/compiled/dat/GUI_District_KISettings.prp b/compiled/dat/GUI_District_KISettings.prp
diff --git a/compiled/dat/GUI_District_KIVolumeSettings.prp b/compiled/dat/GUI_District_KIVolumeSettings.prp
diff --git a/compiled/dat/GUI_District_KIYesNo.prp b/compiled/dat/GUI_District_KIYesNo.prp
diff --git a/compiled/dat/GUI_District_KeyMapDialog.prp b/compiled/dat/GUI_District_KeyMapDialog.prp
diff --git a/compiled/dat/GUI_District_NavigationSettingsDialog.prp b/compiled/dat/GUI_District_NavigationSettingsDialog.prp
diff --git a/compiled/dat/GUI_District_OptionsMenuGUI.prp b/compiled/dat/GUI_District_OptionsMenuGUI.prp
diff --git a/compiled/dat/GUI_District_OptionsMenuRestart.prp b/compiled/dat/GUI_District_OptionsMenuRestart.prp
diff --git a/compiled/dat/GUI_District_OrientationGUI.prp b/compiled/dat/GUI_District_OrientationGUI.prp
diff --git a/compiled/dat/GUI_District_ReleaseNotesDialog.prp b/compiled/dat/GUI_District_ReleaseNotesDialog.prp
diff --git a/compiled/dat/GUI_District_StartupHelpGUI.prp b/compiled/dat/GUI_District_StartupHelpGUI.prp
diff --git a/compiled/dat/GUI_District_TrailerPreviewGUI.prp b/compiled/dat/GUI_District_TrailerPreviewGUI.prp
diff --git a/compiled/dat/GUI_District_jalakControlPanel.prp b/compiled/dat/GUI_District_jalakControlPanel.prp
diff --git a/compiled/dat/Kveer_District_KveerHalls.prp b/compiled/dat/Kveer_District_KveerHalls.prp
diff --git a/compiled/dat/Kveer_District_Textures.prp b/compiled/dat/Kveer_District_Textures.prp
diff --git a/compiled/dat/OptionsMenuEnglish.loc b/compiled/dat/OptionsMenuEnglish.loc
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <localizations>
 	<age name="OptionsMenu">
+		<set name="AudioSettings">
+			<element name="EnableEFX">
+				<translation language="English">Enable EFX</translation>
+			</element>
+			<element name="EnableSubtitles">
+				<translation language="English">Enable Subtitles</translation>
+			</element>
+			<element name="EnableVoiceChat">
+				<translation language="English">Enable Voice Chat</translation>
+			</element>
+			<element name="MicrophoneLevel">
+				<translation language="English">Microphone Level</translation>
+			</element>
+			<element name="OutputDevice">
+				<translation language="English">Output Device</translation>
+			</element>
+		</set>
 		<set name="GameSettings">
 			<element name="Advanced">
 				<translation language="English">Advanced Settings</translation>
@@ -35,6 +52,9 @@
 			<element name="MyVoice">
 				<translation language="English">My Voice</translation>
 			</element>
+			<element name="NPCVoices">
+				<translation language="English">NPC Voices</translation>
+			</element>
 			<element name="OtherVoice">
 				<translation language="English">Other Player's Voice</translation>
 			</element>
@@ -64,11 +84,38 @@
 			</element>
 		</set>
 		<set name="GraphicsSettings">
+			<element name="Ansiotropic">
+				<translation language="English">Anisotropic Filtering</translation>
+			</element>
+			<element name="AntiAliasing">
+				<translation language="English">Anti-Aliasing</translation>
+			</element>
+			<element name="DynamicReflections">
+				<translation language="English">Dynamic Reflections</translation>
+			</element>
+			<element name="GraphicsQuality">
+				<translation language="English">Graphics Quality</translation>
+			</element>
+			<element name="Resolution">
+				<translation language="English">Video Resolution</translation>
+			</element>
 			<element name="RestartWarning">
 				<translation language="English">Video Quality and Texture Quality changes will not take effect until Uru is restarted.
 
 Would you like to quit?</translation>
 			</element>
+			<element name="TextureQuality">
+				<translation language="English">Texture Quality</translation>
+			</element>
+			<element name="VSync">
+				<translation language="English">Vertical Sync</translation>
+			</element>
+			<element name="Windowed">
+				<translation language="English">Windowed</translation>
+			</element>
+			<element name="WindowedMac">
+				<translation language="English">(On Mac press Command + Return)</translation>
+			</element>
 		</set>
 		<set name="InGameHelp">
 			<element name="CCRButton">

diff --git a/compiled/dat/OptionsMenuFrench.loc b/compiled/dat/OptionsMenuFrench.loc
@@ -35,6 +35,8 @@
 			<element name="MyVoice">
 				<translation language="French">Ma voix</translation>
 			</element>
+			<element name="NPCVoices">
+			</element>
 			<element name="OtherVoice">
 				<translation language="French">Voix des autres joueurs</translation>
 			</element>
@@ -63,6 +65,36 @@
 				<translation language="French">Marcher et regarder</translation>
 			</element>
 		</set>
+		<set name="GraphicsSettings">
+			<element name="Ansiotropic">
+				<translation language="French">Filtrage anisotropique</translation>
+			</element>
+			<element name="AntiAliasing">
+				<translation language="French">Anti-crénelage</translation>
+			</element>
+			<element name="DynamicReflections">
+			</element>
+			<element name="GraphicsQuality">
+				<translation language="French">Qualité graphique</translation>
+			</element>
+			<element name="Resolution">
+				<translation language="French">Résolution vidéo</translation>
+			</element>
+			<element name="RestartWarning">
+			</element>
+			<element name="TextureQuality">
+				<translation language="French">Qualité textures</translation>
+			</element>
+			<element name="VSync">
+				<translation language="French">Synchro verticale</translation>
+			</element>
+			<element name="Windowed">
+				<translation language="French">Fenêtré</translation>
+			</element>
+			<element name="WindowedMac">
+				<translation language="French">(On Mac press Command + Return)</translation>
+			</element>
+		</set>
 		<set name="InGameHelp">
 			<element name="CCRButton">
 				<translation language="French">Contacter le Service client &gt;&gt;</translation>