Commit Graph

75 Commits

Author SHA1 Message Date
KoffeinFlummi
06a4f3d10e Remove tabler comments. 2015-04-20 15:48:50 +02:00
Grzegorz Sikora
4283e07942 PL fix 2015-04-19 13:50:08 +02:00
PabstMirror
060dc22ad5 Merge pull request #721 from acemod/privatesPass1
Privates Var Fixing
2015-04-17 23:51:23 -05:00
Tachii
ad61557557 Update stringtable.xml 2015-04-18 03:10:28 +03:00
Tachii
04858bb673 Update stringtable.xml 2015-04-18 02:19:09 +03:00
PabstMirror
00f26144ec More Privates 2015-04-17 15:45:00 -05: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
KoffeinFlummi
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +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
47f8161855 Update stringtable.xml
Italian
2015-04-15 11:18:22 +02:00
Grzegorz Sikora
3543b9c806 PL Translation
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +02:00
KoffeinFlummi
ebcdafe610 Fix spelling of "isClientSetable" 2015-04-14 21:43:19 +02:00
KoffeinFlummi
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +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
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
bux578
8c24d9ec35 fix invalid xml, fix duplicate keys 2015-04-13 15:25:30 +02:00
KoffeinFlummi
8d4003a396 Merge https://github.com/HerrStein/ACE3 into german-merge 2015-04-13 14:21:00 +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
PabstMirror
b50a7a0147 Try to fix degree symbol (encoding issue) 2015-04-12 22:56:46 -05:00
Anthariel
0e925bc006 Update stringtable.xml 2015-04-13 01:31:49 +02:00
licht-im-Norden87
fef0d690f8 Update stringtable.xml 2015-04-12 15:25:18 +02:00
licht-im-Norden87
36ba507ab5 Update stringtable.xml 2015-04-12 14:52:37 +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
licht-im-Norden87
a3f97efbc3 Update stringtable.xml
What does WDG and MGRS mean?
2015-04-12 14:07:49 +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
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
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
Grzegorz
584c77a0b6 microdagr PL translation
fixes
2015-04-10 17:07:40 +02:00
EpMAK
fab5605ad5 Translation
Russian translation of the texts
2015-04-10 17:51:48 +03:00
Asgar
16b2311376 Added German translation for a couple of things, 2015-04-10 14:21:55 +02:00
Legolasindar
cf769e09fb Update stringtable.xml
Add spanish translation
2015-04-10 12:46:31 +02:00
Anthariel
d6b2d13a72 Update stringtable.xml
Added: French Translation (95%)
2015-04-10 06:00:22 +02:00
Grzegorz
6cbb6206c1 microdagr PL translation
fixed typo in line 119
2015-04-10 02:47:19 +02:00
licht-im-Norden87
fbe214db74 Not yet completed 2015-04-10 00:29:45 +02:00
licht-im-Norden87
9cca9dbd80 Update stringtable.xml 2015-04-10 00:23:49 +02:00
PabstMirror
6ec0859f85 MicroDAGR - Allow use in vehicles
Can't show minimap display in turret view (cameraView = "gunner"), but
can bring up the interactive dialog
2015-04-04 14:35:24 -05:00
PabstMirror
e99e35d70b mdagr - remove unneeded error msg 2015-04-02 22:37:00 -05:00
bux578
02141a2947 add microDAGR to weapons array 2015-03-25 18:23:01 +01:00
PabstMirror
a88908d795 Release autotrack when trying to drag map 2015-03-25 09:00:49 -05:00
PabstMirror
600c7aed97 Restore Interaction Icon 2015-03-25 08:57:44 -05:00
bux578
c44b944044 add missing icons 2015-03-25 06:32:08 +01:00
bux578
074bf4ba6d tab to space 2015-03-25 06:06:04 +01:00