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
6,580 Commits 73 Branches 88 Tags 752 MiB
61bc40a650
Commit Graph

228 Commits

Author SHA1 Message Date
simon84
c18284d964 German translation 2015-04-16 22:04:24 +02:00
bux578
5764310833 german translation 
double checked by bw medic
 2015-04-16 21:58:39 +02:00
KoffeinFlummi
11f9478035 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-16 18:31:31 +02:00
PabstMirror
0076be6a86 Fix stringtables 2015-04-15 17:08:35 -05:00
KoffeinFlummi
5c3b06b1bf Merge branch 'patch-1' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/medical/stringtable.xml
 2015-04-15 22:06:18 +02:00
ruPaladin
a3965424b9 addons/medical translation to Russian 2015-04-15 19:09:10 +03:00
Ivan Navarro Cabello
40b784fb7a update stringtable 
added spanish translate
 2015-04-15 17:41:10 +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
af3fdf9b91 Update stringtable.xml 
Italian translation
 2015-04-15 10:28:09 +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
91e25dc215 Missing stringtable entries 2015-04-14 22:34:08 +02:00
KoffeinFlummi
7af6ea36a6 Fix missing pain effect option name 2015-04-14 22:07:43 +02:00
KoffeinFlummi
684c36f8a5 Add pain effect option 2015-04-14 21:49:56 +02:00
KoffeinFlummi
ba377dfd3a Show seperate message for "scratches"; localize 2015-04-14 20:40:17 +02:00
KoffeinFlummi
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
KoffeinFlummi
96319c8799 Merge https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 12:50:14 +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
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
Anthariel
77058857e6 Update stringtable.xml 
Wrong translation
 2015-04-13 02:02:19 +02:00
simon84
51bc7208bc German translation 
Some german translations and corrections
 2015-04-12 20:52:15 +02:00
Anthariel
3f84ac4817 Update stringtable.xml 2015-04-12 17:59:53 +02:00
Anthariel
3842272c43 Update stringtable.xml 
Fixing French & English translation error that I've made on the line : 780 and 781 (thanks KoffeinFlummi)
 2015-04-12 17:55:53 +02:00
KoffeinFlummi
8f2a1735ae Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-12 14:28:28 +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
Legolasindar
b665781399 Update stringtable.xml 
updated spanish translation and added some english missed translation
 2015-04-12 13:58:06 +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
FreeZbe
4a996bf147 Update stringtable.xml 2015-04-10 21:22:07 +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
FreeZbe
e09a3b29d7 Update stringtable.xml 2015-04-10 21:20:09 +02:00
FreeZbe
4dbba270f9 Translations fixes 2015-04-10 21:07:38 +02:00
ruPaladin
8ea96b3086 Update stringtable.xml 2015-04-10 21:21:40 +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
Asgar
16b2311376 Added German translation for a couple of things, 2015-04-10 14:21:55 +02:00
Legolasindar
52d476abd3 Update stringtable.xml 
Added spanisth translation, and two lines of english translation
 2015-04-10 12:29:44 +02:00
Jo David
c258c6c00d fixing translation 2015-04-10 09:05:37 +02: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
95e53fd1bf Update stringtable.xml 
Added: French Translations (~85%)
 2015-04-10 06:20:04 +02:00
Grzegorz
bf6984400f medical PL translation 
like a boss
 2015-04-10 04:30:39 +02:00
licht-im-Norden87
6323a85f17 Update stringtable.xml 
<English>Field Dressing</English>
        <German>Notverband</German>
I dont know if a Notverband is the same as a Field Dressing.
 2015-04-10 00:23:20 +02:00
licht-im-Norden87
4522b45939 Update stringtable.xml 2015-04-10 00:03:46 +02:00
Glowbal
093d340ee7 Changed: Dragging/carrying now works for units with broken legs 
Added unload and load of unconscious units
 2015-04-09 21:23:10 +02:00
Pierre Humberdroz (meat)
4c49765c8f translation changes 
#370
 2015-04-07 10:39:41 +02:00
bux578
92da20ce62 translations 
#367
 2015-04-07 10:02:33 +02:00
PabstMirror
c1abb2669d #340 - Fix stringtables 2015-04-06 11:03:04 -05:00
Glowbal
7ffd690a71 Changed: IVs are now synced and medics can see a unit is receiving an IV 2015-04-05 20:11:54 +02:00
Glowbal
36288fce43 Updated medical action config. 
Added bodybag action
Added Tourniquet action to basic.
Added more displayNameProgress entries.
Removed deadcode
 2015-04-03 22:59:28 +02:00
bux578
1f3c3ce34b fixed spelling of engl. autoinjector 
http://en.wikipedia.org/wiki/Epinephrine_autoinjector
 2015-03-25 18:22:45 +01:00
Glowbal
53e7fe1ba5 fixed #227 2015-03-24 21:08:45 +01:00
Nicolás Badano
a823fb2dca Tweaks on action names to: 
- Remove >> for submenus
- Split long action names in two lines
 2015-03-24 00:16:32 -03:00
PabstMirror
2329212060 Medical Action Stringtable 2015-03-23 13:52:26 -05:00
Glowbal
7b519fc2e0 Merge branch 'master' into Medical_Dragging 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/stringtable.xml
 2015-03-22 09:46:58 +01:00
Nicolás Badano
4e32e584be Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-21 15:33:36 -03:00
Nicolás Badano
f8ea603977 Added dynamic actions to unload patients (unconscious) from vehicles 2015-03-21 15:32:32 -03:00
PabstMirror
9578024693 Dupe stringtable entry 
`Item STR_ACE_MEDICAL_BANDAGING listed twice`
 2015-03-21 12:52:08 -05:00
KoffeinFlummi
b1ed80a23d Remove trailing whitespace in medical stringtable 2015-03-21 00:28:19 +01:00
KoffeinFlummi
33d4bf2f5a Add localization for basic treatments and actions 2015-03-20 18:21:03 +01:00
KoffeinFlummi
9082712ff7 Replace Original with English keys in stringtable 2015-03-20 17:54:26 +01:00
Glowbal
2bee533a8c Added AGM stringtables for drag, carry, load & unload 2015-03-14 09:51:08 +01:00
Glowbal
4ce524ed3c First draft of carry and drop unit 2015-03-12 21:16:49 +01:00
Glowbal
6b91cefb90 Minor fixes and added pain status 2015-03-09 22:23:37 +01:00
Glowbal
8cc0361cb4 localization and displayText fixes 2015-03-09 22:08:43 +01:00
Glowbal
a724fb406a Added triage status 2015-03-05 20:55:38 +01:00
Glowbal
199cd05aa0 New variant of the medical information display 2015-03-05 18:43:44 +01:00
Glowbal
8726e7f1d2 Added CMS equipment items. 2015-03-01 10:25:37 +01:00
KoffeinFlummi
930fb51a20 Medical: First Draft 2015-02-03 20:09:25 +01:00
Thomas Kooi
e468832324 Added initial port of CSE medical (CMS) 2015-01-18 22:16:35 +01:00