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 |
|
KoffeinFlummi
|
2ffbccbf20
|
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
|
2015-04-15 12:59:56 +02:00 |
|
Marco
|
eceb759523
|
Update stringtable.xml
Italian
|
2015-04-15 10:53:35 +02:00 |
|
KoffeinFlummi
|
63fe4118d4
|
Merge https://github.com/FreeZbe/ACE3 into french-merge
|
2015-04-14 14:48:13 +02:00 |
|
Harakhti
|
3c3f6ba4c3
|
Translation: A to I
Some parts filled out, other parts corrected or stylized.
|
2015-04-13 19:28:58 +02:00 |
|
KoffeinFlummi
|
118b5509ea
|
Merge https://github.com/gienkov/ACE3 into polish-merge
|
2015-04-13 13:00: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 |
|
bux578
|
0e3d971274
|
Fix translations error
|
2015-04-12 07:46:43 +02:00 |
|
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 |
|
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 |
|
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 |
|
Grzegorz
|
022e17417f
|
frag PL translation
|
2015-04-10 03:37:30 +02:00 |
|
Grzegorz
|
2925100ec6
|
frag PL translation
|
2015-04-10 03:36:32 +02:00 |
|
Legolasindar
|
dc44b73a36
|
Update stringtable.xml
updated spanish terms
|
2015-04-10 01:12:31 +02:00 |
|
licht-im-Norden87
|
0986eb427d
|
Update stringtable.xml
|
2015-04-09 23:41:10 +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 |
|
jaynus
|
1bb6be5654
|
Cleaning up of all tabs in source code files.
|
2015-04-06 09:22:43 -07:00 |
|
Nou
|
12cadc603f
|
Fragmentation enabled.
|
2015-03-21 21:22:16 -07:00 |
|
Felix Wiegand
|
7c1703ae11
|
Create README.md
|
2015-01-26 13:46:21 +01:00 |
|
PabstMirror
|
6e8c394903
|
Standardize Config Version Stuff
|
2015-01-18 01:32:07 -06:00 |
|
jaynus
|
3fb2a8e245
|
big code clean up
|
2015-01-12 21:14:27 -08:00 |
|
jaynus
|
1e29509b45
|
Dragon, lasers, air_hud and javelin code.
|
2015-01-11 10:24:19 -08:00 |
|