KoffeinFlummi
|
59952441d8
|
Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge
|
2015-04-12 06:22:17 +02:00 |
|
KoffeinFlummi
|
c6efd4e546
|
Merge https://github.com/EpMAK/ACE3 into russian-merge
|
2015-04-12 05:39:46 +02:00 |
|
EpMAK
|
21abff3713
|
Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
|
2015-04-11 21:33:34 +03:00 |
|
EpMAK
|
ea04f4ab3e
|
Revert "Russian Translation"
This reverts commit 17a552bb80.
|
2015-04-11 21:33:07 +03:00 |
|
Kllrt
|
38adfbcb70
|
Added missing CZ strings and made little revision
|
2015-04-11 16:33:00 +02:00 |
|
esteldunedain
|
d6e70cfe6b
|
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 16:20:18 -03:00 |
|
EpMAK
|
17a552bb80
|
Russian Translation
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
|
2015-04-10 19:55:57 +03:00 |
|
EpMAK
|
68d08b8c7b
|
Revert "Translation"
This reverts commit fab5605ad5.
|
2015-04-10 19:46:18 +03:00 |
|
EpMAK
|
fab5605ad5
|
Translation
Russian translation of the texts
|
2015-04-10 17:51:48 +03:00 |
|
VyMajoris
|
4198a942b3
|
Added/Changed - explosives Portuguese Translation
Added "Dead Man's Switch" and "Explosives_Pickup" PT translation and corrected some stuff.
|
2015-04-09 22:42:21 -03:00 |
|
Grzegorz
|
d0787ab2d8
|
explosives PL translation
|
2015-04-10 03:40:03 +02:00 |
|
Legolasindar
|
df31442599
|
Update stringtable.xml
added spanish terms
|
2015-04-10 01:13:33 +02:00 |
|
licht-im-Norden87
|
2304b46e2f
|
Update stringtable.xml
|
2015-04-09 23:39:48 +02:00 |
|
bux578
|
92da20ce62
|
translations
#367
|
2015-04-07 10:02:33 +02:00 |
|
Garth L-H de Wet
|
9d7d71b1b1
|
Changed the tabs to 4 spaces. Hopefully.
|
2015-04-06 22:20:11 +02:00 |
|
Garth L-H de Wet
|
44c597f7c5
|
Explosives, 2 spaces to 4 space tab.
|
2015-04-06 22:10:00 +02:00 |
|
Garth L-H de Wet
|
9c13a87d83
|
Merge branch 'master' into explosiveInteraction
|
2015-03-31 17:21:55 +02:00 |
|
Garth L-H de Wet
|
37fe824426
|
Added pickup action to put down explosives.
|
2015-03-31 17:12:12 +02:00 |
|
Nicolás Badano
|
a823fb2dca
|
Tweaks on action names to:
- Remove >> for submenus
- Split long action names in two lines
|
2015-03-24 00:16:32 -03:00 |
|
Garth L-H de Wet
|
5e67de4d66
|
Ported AGM_Explosives to ace.
Marked locations where Scheduled Delay Execution will probably need to be used.
|
2015-01-12 11:48:26 +02:00 |
|