Merge branch 'master' into standardizeBooks

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">
+				<translation language="English">Where the heck is my book? And why did someone take it in the first place!
-
-Where the heck is my book? And why did someone take it in the first place!
-
-- Nick 
 
+- Nick
 </translation>
 			</element>
 			<element name="WatsonLetter">

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">
+				<translation language="French">Où est passé mon Livre ? Pourquoi quelqu'un l'a-t-il pris !
-
-Où est passé mon Livre ? Pourquoi quelqu'un l'a-t-il pris !
-
-- Nick 
 
+- Nick
 </translation>
 			</element>
 			<element name="WatsonLetter">

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">
+				<translation language="German">Wo zur Hölle ist mein Buch? Wer hat überhaupt etwas da dran zu suchen?!
-
-Wo zur Hölle ist mein Buch? Wer hat überhaupt etwas da dran zu suchen?!
-
-- Nick 
 
+- Nick
 </translation>
 			</element>
 			<element name="WatsonLetter">

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">
+				<translation language="Italian">Dove diavolo è il mio libro? Ma soprattutto, perchè qualcuno l'ha preso?
-
-Dove diavolo è il mio libro? Ma soprattutto, perchè qualcuno l'ha preso?
-
-- Nick 
 
+- Nick
 </translation>
 			</element>
 			<element name="WatsonLetter">

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">
+				<translation language="Spanish">¿Dónde demonios está mi libro? ¡¿Y por qué se lo tuvo que llevar alguien?!
-
-¿Dónde demonios está mi libro? ¡¿Y por qué se lo tuvo que llevar alguien?!
-
-- Nick 
 
+- Nick
 </translation>
 			</element>
 			<element name="WatsonLetter">

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">

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>

compiled/dat/OptionsMenuGerman.loc

@@ -35,6 +35,9 @@
 			<element name="MyVoice">
 				<translation language="German">Eigene Stimme</translation>
 			</element>
+			<element name="NPCVoices">
+				<translation language="German">NPC Voices</translation>
+			</element>
 			<element name="OtherVoice">
 				<translation language="German">Andere Stimmen</translation>
 			</element>
@@ -63,6 +66,35 @@
 				<translation language="German">Gehen und Schwenken</translation>
 			</element>
 		</set>
+		<set name="GraphicsSettings">
+			<element name="Ansiotropic">
+				<translation language="German">Anisotropische Filterung</translation>
+			</element>
+			<element name="AntiAliasing">
+				<translation language="German">Antialiasing</translation>
+			</element>
+			<element name="DynamicReflections">
+			</element>
+			<element name="GraphicsQuality">
+				<translation language="German">Grafikqualität</translation>
+			</element>
+			<element name="Resolution">
+				<translation language="German">Grafikauflösung</translation>
+			</element>
+			<element name="RestartWarning">
+			</element>
+			<element name="TextureQuality">
+				<translation language="German">Texturen-Qualität</translation>
+			</element>
+			<element name="VSync">
+				<translation language="German">Auf Vsync warten</translation>
+			</element>
+			<element name="Windowed">
+				<translation language="German">Im Fenster</translation>
+			</element>
+			<element name="WindowedMac">
+			</element>
+		</set>
 		<set name="InGameHelp">
 			<element name="CCRButton">
 				<translation language="German">Kunden-Support &gt;&gt;</translation>
@@ -161,6 +193,9 @@ Umsehen - Maus bei gedrückter rechter Maustaste
 			<element name="DemoTrailer">
 				<translation language="German">URU Vorschau</translation>
 			</element>
+			<element name="Explore">
+				<translation language="German">Optionen</translation>
+			</element>
 			<element name="GameSettings">
 				<translation language="German">Spieleinstellungen</translation>
 			</element>
@@ -203,9 +238,6 @@ Umsehen - Maus bei gedrückter rechter Maustaste
 			<element name="URULive">
 				<translation language="German">Videos</translation>
 			</element>
-			<element name="Explore">
-				<translation language="German">Optionen</translation>
-			</element>
 		</set>
 		<set name="Messages">
 			<element name="Calibration">

compiled/dat/OptionsMenuItalian.loc

@@ -35,6 +35,9 @@
 			<element name="MyVoice">
 				<translation language="Italian">Tua voce</translation>
 			</element>
+			<element name="NPCVoices">
+				<translation language="Italian">NPC Voices</translation>
+			</element>
 			<element name="OtherVoice">
 				<translation language="Italian">Voce altri giocatori</translation>
 			</element>
@@ -63,6 +66,35 @@
 				<translation language="Italian">Cammina e panoramica</translation>
 			</element>
 		</set>
+		<set name="GraphicsSettings">
+			<element name="Ansiotropic">
+				<translation language="Italian">Filtro anisotropico</translation>
+			</element>
+			<element name="AntiAliasing">
+				<translation language="Italian">Antialias</translation>
+			</element>
+			<element name="DynamicReflections">
+			</element>
+			<element name="GraphicsQuality">
+				<translation language="Italian">Qualità grafica</translation>
+			</element>
+			<element name="Resolution">
+				<translation language="Italian">Risoluzione video</translation>
+			</element>
+			<element name="RestartWarning">
+			</element>
+			<element name="TextureQuality">
+				<translation language="Italian">Qualità texture</translation>
+			</element>
+			<element name="VSync">
+				<translation language="Italian">Sync verticale</translation>
+			</element>
+			<element name="Windowed">
+				<translation language="Italian">In finestra</translation>
+			</element>
+			<element name="WindowedMac">
+			</element>
+		</set>
 		<set name="InGameHelp">
 			<element name="CCRButton">
 				<translation language="Italian">Contatto Servizio Clienti &gt;&gt;</translation>
@@ -161,6 +193,9 @@ Guardarsi intorno - Mouse destro + Trascinare
 			<element name="DemoTrailer">
 				<translation language="Italian">Anteprima di URU</translation>
 			</element>
+			<element name="Explore">
+				<translation language="Italian">Alle Opzioni</translation>
+			</element>
 			<element name="GameSettings">
 				<translation language="Italian">Impostazioni gioco</translation>
 			</element>
@@ -203,9 +238,6 @@ Guardarsi intorno - Mouse destro + Trascinare
 			<element name="URULive">
 				<translation language="Italian">Video</translation>
 			</element>
-			<element name="Explore">
-				<translation language="Italian">Alle Opzioni</translation>
-			</element>
 		</set>
 		<set name="Messages">
 			<element name="Calibration">

compiled/dat/OptionsMenuSpanish.loc

@@ -35,6 +35,8 @@
 			<element name="MyVoice">
 				<translation language="Spanish">Mi voz</translation>
 			</element>
+			<element name="NPCVoices">
+			</element>
 			<element name="OtherVoice">
 				<translation language="Spanish">Voz del otro jugador</translation>
 			</element>
@@ -63,6 +65,37 @@
 				<translation language="Spanish">Caminar y ver</translation>
 			</element>
 		</set>
+		<set name="GraphicsSettings">
+			<element name="Ansiotropic">
+				<translation language="Spanish">Filtro anisotrópico</translation>
+			</element>
+			<element name="AntiAliasing">
+			</element>
+			<element name="DynamicReflections">
+			</element>
+			<element name="GraphicsQuality">
+				<translation language="Spanish">Calidad de los gráficos</translation>
+			</element>
+			<element name="Resolution">
+				<translation language="Spanish">Resolución de vídeo</translation>
+			</element>
+			<element name="RestartWarning">
+				<translation language="Spanish">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="Spanish">Calidad de las texturas</translation>
+			</element>
+			<element name="VSync">
+				<translation language="Spanish">Sincr. vertical</translation>
+			</element>
+			<element name="Windowed">
+				<translation language="Spanish">En ventana</translation>
+			</element>
+			<element name="WindowedMac">
+			</element>
+		</set>
 		<set name="InGameHelp">
 			<element name="CCRButton">
 				<translation language="Spanish">Contactar con el Servicio de Atención al Cliente &gt;&gt;</translation>