Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,142 Commits 73 Branches 88 Tags 752 MiB
f3f57c6a38
Commit Graph

160 Commits

Author SHA1 Message Date
ToasterBR
f4a51d57ef Translation to Brazilian Portuguese (PT-BR) 
Made all remaining translations, including new ones like the sitting
module, for example.
 2015-06-27 15:48:39 -03:00
SilentSpike
f2e5f729e8 Merge branch 'master' into gm_revamp 2015-06-27 18:26:30 +01:00
Macusercom
cf2f36a775 Corrections suggested by others 2015-06-16 23:17:34 +02:00
Macusercom
24cea18ae5 Revert "Revert "Added German translations"" 
This reverts commit 4403e3c665.
 2015-06-16 03:21:25 +02:00
Macusercom
4403e3c665 Revert "Added German translations" 
This reverts commit 0adc07d284.
 2015-06-16 03:06:23 +02:00
Macusercom
0adc07d284 Added German translations 2015-06-16 03:06:13 +02:00
PabstMirror
4a8344e1a4 Merge branch 'master' into userActionPrototype 
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
	addons/interact_menu/stringtable.xml
	extensions/CMakeLists.txt
 2015-06-13 15:05:57 -05:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +02:00
Ivan Navarro Cabello
d15bae105d Updated spanish translation 
Updated spanish translation
 2015-06-08 12:43:07 +02:00
SilentSpike
8a4b4a7e0c Added a bunch of basic actions 2015-06-05 18:37:29 +01:00
gienkov
de13985492 interact_menu translation 2015-06-05 09:55:13 +02:00
gienkov
c1a7374404 Merge remote-tracking branch 'upstream/master' into pl-translation-1 
Conflicts:
	addons/interact_menu/stringtable.xml
 2015-06-05 09:40:50 +02:00
PabstMirror
cecc133a59 Missing </Key> in stringtable 2015-06-04 13:22:55 -05:00
jonpas
9fbf256acd Merge branch 'master' into macroSTR 
Conflicts:
	addons/hearing/functions/fnc_putInEarplugs.sqf
	addons/interact_menu/ACE_Settings.hpp
 2015-06-04 17:13:09 +02:00
gienkov
46dbd3113c Fix 2015-06-04 01:38:57 +02:00
gienkov
fb10961a9b PL translation for new things 2015-06-04 01:34:58 +02:00
SzwedzikPL
18940d0787 Interaction menu background options 2015-06-03 06:04:47 +02:00
jonpas
d934c25b78 Merge branch 'master' into macroSTR 
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
 2015-05-30 19:54:32 +02:00
Glowbal
00acbaf44d Added blur background client setting 2015-05-29 21:56:07 +02:00
PabstMirror
b0bfb7dd43 Fix Ladders - Add User Setting 2015-05-29 13:00:04 -05:00
jonpas
87db721d4f Stringtable fixes up to medical 2015-05-27 21:19:14 +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
2dd06babec Added: Italian translations completed. 
Fixed: BOM markers where missing
 2015-05-10 11:44:46 +02:00
Alessandro Foresi
6695a8793b Added: Some italian translastions 2015-05-09 23:43:03 +02:00
KoffeinFlummi
298e1d88bd Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 23:17:39 +02:00
Harakhti
6c2717be7f More more translations 
Stope.
 2015-05-02 18:06:01 +02:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
KoffeinFlummi
f1ba0cff26 Merge https://github.com/ProfessorCZ/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/advanced_ballistics/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 00:26:25 +02:00
KoffeinFlummi
debfe990e8 Fix duplicates 2015-05-02 00:19:10 +02:00
KoffeinFlummi
13b99ed53f Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/interact_menu/stringtable.xml
 2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
KoffeinFlummi
fb807cbb86 Merge branch 'master' into spanish-merge 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-01 22:44:10 +02:00
Dimaslg
6f2caec6ec Last touches to Spanish translation 2015-05-01 22:42:09 +02:00
adam3adam
f5303d455c Translation of some stuff into czech language 
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
 2015-05-01 22:23:03 +02:00
KoffeinFlummi
c9ff497c83 Merge branch 'master' into polish-merge 
Conflicts:
	addons/respawn/stringtable.xml
 2015-05-01 21:13:36 +02:00
Lubomír Blažek
dcb3196e58 Czech strings 2015-05-01 20:52:41 +02:00
Grzegorz
e36fbe9da7 Update stringtable.xml 2015-05-01 19:32:43 +02:00
Grzegorz Sikora
4668869959 PL translation 2015-05-01 19:30:30 +02:00
ruPaladin
2aa788bba2 Update stringtable.xml 2015-05-01 19:26:23 +03:00
KoffeinFlummi
48e59f0d71 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:46:58 +02:00
KoffeinFlummi
1e786d4a92 Merge https://github.com/FreeZbe/ACE3 into french-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:45:00 +02:00
KoffeinFlummi
e46eba673f Merge branch 'master' into german-translation 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:36:40 +02:00
KoffeinFlummi
954e4ef549 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:32:19 +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
Felix Wiegand
526b0a2d59 Merge pull request #931 from gienkov/master 
PL translation
 2015-05-01 17:15:22 +02:00
KoffeinFlummi
5f60321a69 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
 2015-05-01 17:12:00 +02:00
FreeZbe
acf74dd2ae Update stringtable.xml 2015-05-01 14:13:32 +02:00
bux578
2acc10ba70 meh 2015-05-01 12:19:42 +02:00
bux578
aa2e5077e4 missing german translation 2015-05-01 12:17:28 +02:00
Grzegorz
1e0eaa1971 Update stringtable.xml 2015-04-30 22:55:43 +02:00
Grzegorz Sikora
03973f3dcf PL translation 2015-04-30 22:54:15 +02:00
PabstMirror
090062153c Merge branch 'master' into interactMoreOptions 
Conflicts:
	addons/interact_menu/config.cpp
 2015-04-30 15:36:00 -05:00
commy2
5ec8b6d36c Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick 2015-04-30 20:01:58 +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
Bla1337
5d1478b733 interact and medical system localization upd 2015-04-30 14:01:22 +03:00
PabstMirror
11aafe013b Localization 2015-04-29 23:53:00 -05:00
ulteq
4e171c2988 Merge pull request #916 from FreeZbe/master 
French: update and fix stringtable
 2015-04-29 16:46:49 +02:00
FreeZbe
5ec6bea71d French: update stringtable 2015-04-29 16:19:23 +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
Bla1337
cfbf3bd053 Localization update 2015-04-29 11:20:21 +03:00
PabstMirror
9e8b13cd2b Merge branch 'master' into altSelfInteract 
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
	addons/interact_menu/functions/fnc_renderSelector.sqf
	addons/interact_menu/stringtable.xml
 2015-04-28 14:02:03 -05:00
ulteq
2a759aba70 Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-28 18:55:23 +02:00
NukeDev
db82df6214 Italian's Translation's Changes v2 2015-04-28 18:10:35 +02:00
Ivan Navarro Cabello
8a55c69cd7 added spanish translation 
added spanish translation
 2015-04-28 17:03:49 +02:00
simon84
8ac6f61fcf added some translations 
added some translations
 2015-04-28 00:36:37 +02:00
Josuan Albin
e8dec708bc Some french entries and a german duplicate 
Added some french entries and removed a german duplicate
 2015-04-27 16:18:28 +02:00
Grzegorz
a7e1d1c1c8 Update stringtable.xml 2015-04-25 14:36:53 +02:00
commy2
664d08d4aa add option to only use action when clicking 2015-04-25 08:23:54 +02:00
Grzegorz Sikora
1063d4bb2c PL translation 2015-04-22 13:17:43 +02:00
PabstMirror
96be881ea9 User changeable text/shadow colors for interaction 2015-04-20 18:28:01 -05:00
esteldunedain
9295393dd6 Allow cursor for interactions 2015-04-20 13:54:51 -03:00
KoffeinFlummi
592e0d2dd3 Merge https://github.com/ruPaladin/ACE3 into russian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-19 00:51:09 +02:00
KoffeinFlummi
3aafa2082d Merge https://github.com/nomisum/ACE3 into german-merge 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-19 00:39:44 +02:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
ruPaladin
a6e0cac734 interact_menu (fixes to prevent text overlapping) 2015-04-17 16:02:46 +03:00
nomisum
8813315f36 added missing translations german 2015-04-17 11:40:31 +02:00
Coren4
4ff68eabd4 Update stringtable.xml 2015-04-16 14:59:19 +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
FreeZbe
df61f5c995 French : update stringtable 2015-04-15 21:15:57 +02:00
ruPaladin
64504a9515 addons/interact_menu translation to Russian 2015-04-15 18:27:28 +03: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
544894a05e Update stringtable.xml 
Italian
 2015-04-15 10:59:44 +02:00
esteldunedain
25e8e93fd0 Add back stringtables for the list menu 2015-04-15 01:32:42 -03: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
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
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
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
PabstMirror
b5e5359795 CursorCentered - Localizations 2015-04-11 00:35:18 -05: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