Merge branch 'patch-1' of https://github.com/Clon1998/ACE3 into german-merge

Conflicts:
	addons/interaction/stringtable.xml
This commit is contained in:
KoffeinFlummi 2015-04-15 21:55:52 +02:00
commit 234e8e5c40

View File

@ -659,7 +659,7 @@
</Key>
<Key ID="STR_ACE_Interaction_ModifierKey">
<English>Modifier Key</English>
<German>Modifikator Taste</German>
<German>Modifikator-Taste</German>
<Polish>Modyfikator</Polish>
<French>Modifier la touche</French>
<Spanish>Tecla modificadora</Spanish>
@ -712,7 +712,7 @@
</Key>
<Key ID="STR_ACE_Interaction_Passengers">
<English>Passengers</English>
<German>Fahrzeuginsassen</German>
<German>Passagiere</German>
<Spanish>Pasajeros</Spanish>
<Russian>Пассажиры</Russian>
<Czech>Pasažéři</Czech>