Commit Graph

36 Commits

Author SHA1 Message Date
commy2
fb3ba51fe5 port alternative wirecutter sound 2015-04-15 22:19:43 +02:00
KoffeinFlummi
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
KoffeinFlummi
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
Harakhti
1b60a335a5 Translation: J to M
I feel burned out. This was very specifically long and tedious.
2015-04-13 23:03:09 +02:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
KoffeinFlummi
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
KoffeinFlummi
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
KoffeinFlummi
614afa8537 Merge https://github.com/Kllrt/ACE3 into czech-merge
Conflicts:
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/goggles/stringtable.xml
	addons/grenades/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
FreeZbe
45ff6c7ce9 French: (Nearly) Complete French translations
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
2015-04-12 14:15:45 +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
Jo David
33a14076fc Merge branch 'master' of https://github.com/acemod/ACE3 into translations
Conflicts:
	addons/captives/stringtable.xml
	addons/medical/stringtable.xml
2015-04-10 09:01:24 +02:00
Anthariel
523417ba3c Update stringtable.xml
Added: French Translation (100%)
2015-04-10 06:23:13 +02:00
Grzegorz
e0a2a144c5 logistics_wirecutter 2015-04-10 03:10:05 +02:00
Legolasindar
e63b9c7aa9 Update stringtable.xml
added spanish translation
2015-04-10 01:38:31 +02:00
commy2
5ea35a01bb sorting out required addons for modularity 2015-04-09 13:23:29 +02:00
bux578
92da20ce62 translations
#367
2015-04-07 10:02:33 +02:00
PabstMirror
1e2b47d6e7 Wirecutters - use new createAction system 2015-03-29 12:08:01 -05:00
PabstMirror
82042f85f4 Wirecutters: fix error on end mission with keydown 2015-03-24 04:03:16 -05:00
PabstMirror
858e5def5a Interact menu event consistant
"interactMenuOpened",  to match event from #191
2015-03-11 12:45:01 -05:00
PabstMirror
794a1f9922 Wirecutter handles interact event
adds helper objects to all fences that have actions
2015-03-10 16:01:46 -05:00
PabstMirror
fb3a610649 Fix bad STR_ACE_Common_ACETeam 2015-02-14 00:39:09 -06:00
PabstMirror
42bc8eff1a wirecutter typenames to lowercase 2015-02-01 11:56:54 -06:00
PabstMirror
aabae5a3bc ace_interaction to required 2015-01-29 01:01:58 -06:00
PabstMirror
54ab834e5c Fix stringtable 2015-01-28 12:54:14 -06:00
PabstMirror
719e308f9b readme 2015-01-28 12:04:30 -06:00
PabstMirror
bb473f95f0 Func Headers 2015-01-28 12:01:40 -06:00
PabstMirror
d62595e76d Added some AIA fences 2015-01-28 11:51:42 -06:00
PabstMirror
0647a80aad Wirecutter - Self->Equipment Action 2015-01-28 03:22:39 -06:00
PabstMirror
39a4977efe Port: Wirecutting from AGM
by gpgpgpgp, edited by commy2

Doesn't really work as well as I'd like (some fences are uncuttable)
2015-01-27 22:42:45 -06:00