KoffeinFlummi
|
11f9478035
|
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
|
2015-04-16 18:31:31 +02:00 |
|
KoffeinFlummi
|
1b67b2df26
|
Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
Conflicts:
addons/disposable/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
|
2015-04-15 22:20:47 +02:00 |
|
FreeZbe
|
c0dbf10971
|
French : update stringtable
|
2015-04-15 21:14:00 +02:00 |
|
Ivan Navarro Cabello
|
40b784fb7a
|
update stringtable
added spanish translate
|
2015-04-15 17:41:10 +02:00 |
|
ruPaladin
|
6fca601759
|
Kestrel 4500NV translation to Russian
|
2015-04-15 18:24:57 +03:00 |
|
KoffeinFlummi
|
2ffbccbf20
|
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
|
2015-04-15 12:59:56 +02:00 |
|
Marco
|
8c0f52e615
|
Update stringtable.xml
Italian
|
2015-04-15 11:08:04 +02:00 |
|
Grzegorz Sikora
|
1be197728e
|
AdvBal PL translation
|
2015-04-14 11:42:52 +02:00 |
|
ulteq
|
c94c1c1bcb
|
Replaced tabs with spaces
|
2015-04-07 20:19:35 +02:00 |
|
ulteq
|
a4c70fe616
|
Integrated the Kestrel 4500 into the ace interaction menu
|
2015-04-07 19:57:42 +02:00 |
|
ulteq
|
0315219cf2
|
Added new Kestrel4500 branch:
*TODO: Fix the dialog button actions (action="...") in RscTitles.hpp
|
2015-04-07 17:43:54 +02:00 |
|