Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflicts resolve again

Browse Source 
Conflicts resolve again
This commit is contained in:
Dimaslg 2015-04-29 21:23:32 +02:00
parent f8d5c423ae
commit 864c3ea03b
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/missileguidance/stringtable.xml
View File

@ -46,7 +46,6 @@
</Key>
<Key ID="STR_ACE_Hydra70_DAGR_Desc">
<English>Hydra-70 DAGR Laser Guided Missile</English>
<French>Missile à guidage Hydra-70 DAGR</French>
<Spanish>Misil guiado por láser Hydra-70 DAGR</Spanish>
<French>Missile à guidage laser Hydra-70 DAGR</French>
<Polish>Laserowo naprowadzana rakieta Hydra-70 DAGR</Polish>

13
addons/optionsmenu/stringtable.xml
View File

@ -149,13 +149,8 @@
</Key>
<Key ID="STR_ACE_OptionsMenu_scalarType">
<English>Number</English>
<<<<<<< HEAD
<German>Nummer</German>
<Spanish>Número</Spanish>
=======
<German>Zahl</German>
<Spanish>Numero</Spanish>
>>>>>>> acemod/master
<Spanish>Número</Spanish>
<Russian>Число</Russian>
<Czech>Číslo</Czech>
<Polish>Cyfra</Polish>
@ -222,12 +217,8 @@
<English>Option Menu UI Scaling</English>
<French>Menu option: taille de l'UI</French>
<Polish>Skalowanie UI menu ustawień</Polish>
<<<<<<< HEAD
<Spanish>Menú de opciónes de escalado de la interfaz de usuario</Spanish>
=======
<Spanish>Opción de escalado del menú UI</Spanish>
<Spanish>Opción de escalado del menú IU</Spanish>
<German>UI Skalierung</German>
>>>>>>> acemod/master
</Key>
</Package>
</Project>