Commit Graph

258 Commits

Author SHA1 Message Date
jonpas
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
jonpas
6f6f2a55f0 Stringtable fixes except medical 2015-05-27 21:43:30 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello
047a2ee736 added spansih translate
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).

I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
Macusercom
7eeddfbd65 German translations
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
PabstMirror
64a401ee8c #1241 closed - Add Editor placeable item 2015-05-20 17:17:10 +02:00
PabstMirror
fd8d68c451 Merge branch 'master' into multipleDevices
Conflicts:
	addons/common/stringtable.xml
2015-05-14 15:38:13 -05:00
SAM
021679208b First batch of settings files
Separating ACE_Settings.hpp from config.cpp
2015-05-14 20:46:35 +02:00
Glowbal
abadf05342 Merge remote-tracking branch 'gienkov/module-translations'
Conflicts:
	addons/medical/stringtable.xml
2015-05-14 16:01:41 +02:00
Ivan Navarro Cabello
43c5afac55 fixed some spanish translation
I fixed some spanish translation.
2015-05-14 14:32:35 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
PabstMirror
ffce1f6386 Condense mDagr interactions - intergrate kestral 2015-05-11 21:49:13 -05:00
PabstMirror
05f1b884fa Localization/ headers 2015-05-10 15:17:50 -05:00
PabstMirror
f7ff4a2f36 Base Device Handler Framework
Multiple devices share Home/Ctrl-home keys
2015-05-10 14:59:53 -05:00
VKing
8d61b42e87 Changed MicroDAGR position and target display to 10-digit grids 2015-05-10 21:47:05 +02:00
VKing
2dd42f828d "Borrowed" pabst's UTM zone/band function and moved it from microdagr to map 2015-05-10 21:45:49 +02:00
KoffeinFlummi
2bb3a0f139 Cleanup #1095
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
2015-05-10 16:19:46 +02:00
Alessandro Foresi
9e093b9459 Added: More italian translations 2015-05-09 23:52:01 +02:00
KoffeinFlummi
e96f23c197 Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
	addons/atragmx/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/respawn/stringtable.xml
2015-05-01 17:30:59 +02:00
KoffeinFlummi
761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
Glowbal
1ca0d66f30 Initial categories 2015-04-30 22:02:20 +02:00
Harakhti
4e165e2572 Update Hungarian translations
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
2015-04-30 13:25:25 +02:00
Dimaslg
f8d5c423ae Merge conflicts resolved 2015-04-29 21:15:22 +02:00
KoffeinFlummi
a1e709047e Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
	AUTHORS.txt
	addons/aircraft/stringtable.xml
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/disposable/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/grenades/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/markers/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
	addons/nametags/stringtable.xml
	addons/nightvision/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/parachute/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/respawn/stringtable.xml
	addons/safemode/stringtable.xml
	addons/switchunits/stringtable.xml
	addons/vehiclelock/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
KoffeinFlummi
1bb8628109 Merge https://github.com/simon84/ACE3 into german-merge 2015-04-26 21:00:22 +02:00
VyMajoris
523cb49ff1 Added - Portuguese translation to lots of things.
Also fixed a typo the english key for STR_ACE_microdagr_configure.
2015-04-26 03:09:16 -03:00
Dimaslg
274663e1b9 Spanish Translation
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
Nicolás Badano
1bfb13abac Revert "remove author from items inheriting ACE_ItemCore" 2015-04-21 19:07:42 -03:00
bux578
3897b73d56 remove author from items inheriting ACE_ItemCore 2015-04-21 19:16:54 +02:00
PabstMirror
fdbd0c1905 #777 - mDagr - Update map pos each frame. 2015-04-20 16:12:01 -05:00
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
simon84
cc75928cc0 Merge remote-tracking branch 'acemod/master'
Conflicts:
	addons/disarming/stringtable.xml
	addons/hearing/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-16 22:47:51 +02:00
simon84
c18284d964 German translation 2015-04-16 22:04:24 +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
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
simon84
51bc7208bc German translation
Some german translations and corrections
2015-04-12 20:52:15 +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
bux578
4fecc1372f add microDAGR to ace misc box 2015-03-25 06:05:06 +01:00
PabstMirror
3ab033065f #233 - Clean up mDAGR interaction menu
Adds exception to use on map (also for base ACE_equipment)
selfInteract has 3 options [close, show minimap, show dialog] (only 2
possible shown at any time)
Keybinds are just toggle and close
2015-03-24 03:50:06 -05:00
PabstMirror
ed3fc5919f #231 - Close DAGR if player dead/null 2015-03-23 17:34:40 -05:00
PabstMirror
ef3b411c6c Close dagr when dropping item 2015-03-23 15:02:20 -05:00
PabstMirror
17eddb089b Missing Semicolon 2015-03-23 13:57:16 -05:00
PabstMirror
81836d1bc1 semiColon 2015-03-19 03:10:33 -05:00
PabstMirror
e57f007288 Match Ace_map's style 2015-03-18 14:39:04 -05:00
PabstMirror
cd6a567ba3 Fix Icon 2015-03-18 13:50:27 -05:00
PabstMirror
396359ba67 Self Actions To Open (under equipment) 2015-03-18 13:46:39 -05:00
Glowbal
5390c3668e Added icon microDAGR 2015-03-13 18:43:21 +01:00
PabstMirror
c1c3325368 Fix missing display error. 2015-03-12 13:02:04 -05:00
PabstMirror
da87425df3 Vector intergration (Hold Tab+R) 2015-03-12 12:57:44 -05:00
PabstMirror
58029101b8 readme 2015-03-12 12:41:04 -05:00
PabstMirror
f33da5928c Icon Size 2015-03-12 12:31:21 -05:00
PabstMirror
5197a5c453 Date display to info screen 2015-03-12 12:28:52 -05:00
PabstMirror
ec6d2c44bc Fix mappos not saving 2015-03-12 12:16:33 -05:00
PabstMirror
777e088484 Ambient light levels for background fading 2015-03-12 12:09:35 -05:00
PabstMirror
95d59a1b3a Headers 2015-03-11 02:06:07 -05:00
PabstMirror
d6e7775cac Can Show: Hide when gun up 2015-03-10 22:11:25 -05:00
PabstMirror
13e6ae60b2 Settings Menu, Mils, Localization 2015-03-10 21:48:57 -05:00
PabstMirror
1cf8843cae Show Waypoints on map 2015-03-09 16:28:29 -05:00
PabstMirror
ce5595e107 BIS_fnc_gridToPos 2015-03-09 16:09:00 -05:00
PabstMirror
29bd613445 canShow base 2015-03-09 13:53:49 -05:00
PabstMirror
1d6cfbf6b7 Various Changes 2015-03-09 13:52:15 -05:00
PabstMirror
f387da1475 Working Base MicroDAGR 2015-03-09 10:46:59 -05:00