Commit Graph

299 Commits

Author SHA1 Message Date
358228f5bb Cleanup De Stringtables 2015-12-06 15:03:15 -06:00
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
291f4df072 Update German Stringtables
Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

kommas...........................................................................................................................................................

Rallypoint

Update stringtable.xml

slideshow, not finished yet

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

What does Curator mean in this context?
l. 294, l 302

cargo

Update stringtable.xml

Update stringtable.xml

I left a few things out. I'd like if someone gives me  advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...

Update stringtable.xml

Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Fix Mistakes from merge

Fix Empty Entries

Fix Mistake

Fix
2015-12-04 22:06:44 -06:00
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
b091b73e24 fixes 2015-11-27 21:54:04 +01:00
3250245587 3.4.0 translations and fixes 2015-11-27 21:50:57 +01:00
86f7ee2ad2 Merge pull request #2834 from acemod/addEarPlugsLoudness
Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues
2015-11-24 10:52:11 -06:00
c2564de5ef Fix UBC for 1.54
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
2015-11-20 23:27:29 -06:00
d6000ae985 local -> private 2015-11-17 14:33:17 -06:00
87b9ff9785 Hearing - Reset earplugs on respawn, addItem setting
Fix #2835 - readd item on respawn
Fix #2837 - setVariable false on respawn
2015-11-10 20:44:55 -06:00
845909f8af #2833 - Add earplugs based on loudness (+MGs)
Use same loudness calc as firedNear (replacing old audibleFire)
Give ear plugs to machine gunners (depends on magzine size)
2015-11-08 14:02:00 -06:00
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
3471ebef16 Merge https://github.com/dudakov/ACE3 into russian-merge 2015-09-23 19:17:52 +02:00
a621a0c693 Fixes to spanish translations 2015-09-18 13:36:57 -03:00
4d2707eae2 Russian Translations - Update 2015-09-17 12:21:21 +03:00
341e122e4c Russian Translations - Update 2015-09-17 11:43:14 +03:00
463e21dd91 330 2015-09-16 12:40:30 +02:00
478b618e4b Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
f7bd557a30 Fix some stringtable weirdness 2015-09-14 16:11:43 -05:00
89eb98a248 Added: IT more translation, medic partial
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
63c2712360 Merge branch 'release' into portuguese 2015-09-10 21:59:30 +02:00
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
1edcc320d1 Merge remote-tracking branch 'origin' into pl-translation-7 2015-09-07 16:05:45 +02:00
78084f271a Changed "Effect Zeus RC" to "Affects Zeus RC" 2015-09-06 07:11:27 +03:00
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03:00
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02:00
910bb151e2 #1988 - Boost explosive hearing damage 2015-08-30 01:47:40 -05:00
8307ccea96 firedNear - use new isKindOf 2015-08-30 01:37:14 -05:00
2f54cfadbc Merge pull request #2146 from jokoho48/codeCleanupHearing
Code cleanup of Hearing module
2015-08-30 01:18:47 -05:00
17f647f341 PL translation 2015-08-30 01:42:42 +02:00
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
657157d767 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/hearing/functions/fnc_moduleHearing.sqf
2015-08-29 22:38:26 +02:00
998bc2d45a Merge pull request #2297 from acemod/addMoreHearingProtection
Add Hearing Protection to Helmets with Peltor Headsets
2015-08-29 22:34:59 +02:00
19a6226ced add Hearing Protection to Helmets with Peltors 2015-08-28 09:10:58 +02:00
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
bd56d1bb83 ok that is my fault 2015-08-14 00:36:36 +02:00
cb8d009ef0 Woops 2015-08-14 00:31:42 +02:00
c6fbdb420c Code cleanup of Hearing module 2015-08-13 23:42:20 +02:00
a6acff9178 Setting to disable hearing for zeus RC 2015-08-08 14:40:19 -05:00
6086553fce Move DoNotForce to common 2015-08-06 12:24:56 -05:00
f99e8ba5bc Don't allow forcing the tinnitus effect 2015-08-02 12:30:35 -05:00
c0fb2e1b65 Add Ear Ringing setting to module (Ref #1981) 2015-08-02 12:15:26 -05:00
d0f91c5ebf Row 1
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
c9d4395a42 Merge pull request #1870 from SzwedzikPL/ah6_gun_fix
M134 minigun rate of fire & dispersion fix + hearing protection for heli pilots
2015-07-25 21:39:21 +02:00