Commit Graph

157 Commits

Author SHA1 Message Date
esteldunedain
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
PabstMirror
ed653456e5 Merge pull request #3338 from acemod/translations156merge
Fix Merge Conflicts on More Italian Translations
2016-02-19 15:09:40 -06:00
PabstMirror
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
commy2
0a9048815b simlify some select CODE statements 2016-02-06 14:59:31 +01:00
commy2
41e39c9c3a replace more filter with select 2016-02-06 11:58:31 +01:00
Thomas Kooi
653f6567cc Fix french translation refresh marker interval
As per @alganthe's comment on #3114
2016-02-04 20:30:51 +01:00
Thomas Kooi
543d54d37e Merge pull request #3114 from Luigium/master
Fixed and added French Translation
2016-02-04 20:28:00 +01:00
ProfessorCZ
61611d0ec7 Czech Translation - Update
Update
2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
Luigi
7f9c766770 Fixed and added French Translation 2016-01-04 16:47:15 +01:00
Alessandro Foresi
2d152675fc Add: IT small translations, DE removed duplicate 2016-01-03 13:02:01 +01:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
PabstMirror
5f74daec42 Fix dupe german stringtable entry 2015-12-31 22:28:35 -06:00
licht-im-Norden87
2d64d54d98 Update German Stringtable
Iam sure there was a translation some time ago. Someone must have deleted it.

spelling mistake

Update Stringtable

100% some of them already existed in german language

Update stringtable.xml

spelling mistake

Update stringtable.xml

Iam not sure if SSWT is a Scharfschützenzweibein. However, it was used before, i just adpated it.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Handelt es sich bei dem Modell den auch um das Produkt von Sharpshooters® http://shop.centermassinc.com/Sharpshooters-Sniper-Weapon-Tripod-Kit-764737932766.htm bzw ist ads erkennbar. Ich persönlich halte die Bezeichnung SSWT-Kit für ein wenig ungünstig.

Update stringtable.xml
2015-12-31 14:17:13 -06:00
freghar
a383da5b2d fix inverted isTurnedOut for map lighting
According to the comment, the idea is to provide unobscured map when
inside an enclosed vehicle (!isTurnedOut).

Signed-off-by: freghar <freghcz@gmail.com>
2015-12-20 11:53:08 +01:00
PabstMirror
575fabb69d #2872-Map time support for subclasses of ItemWatch 2015-11-24 16:17:06 -06:00
PabstMirror
7981faad64 private -> local 2015-11-23 17:47:58 -06:00
PabstMirror
0273dd1d4d Merge branch 'master' into fixFlashlightPrivates 2015-11-23 17:45:41 -06:00
PabstMirror
c4117e1283 Merge branch 'master' into settingsErrorChecking
Conflicts:
	addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
kaban
f8481ae5f2 Merge branch 'master' of https://github.com/acemod/ACE3.git into develop
Conflicts:
	addons/captives/stringtable.xml
2015-11-18 06:39:58 +03:00
PabstMirror
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
PabstMirror
e72c1d874a Merge branch 'master' into fixFlashlightPrivates
Conflicts:
	addons/map/functions/fnc_determineMapLight.sqf
2015-11-10 21:21:06 -06:00
PabstMirror
01d679c5dc #2810 - Delete map glow light from DC players 2015-11-07 14:33:41 -06:00
PabstMirror
ff60cdcfa3 #2828 - Fix empty flashlightProxy model 2015-11-07 11:44:31 -06:00
PabstMirror
c91789f3c4 Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking 2015-11-06 20:30:12 -06:00
kaban
e2763dde27 Russian Translations - Update 2015-11-05 03:28:53 +03:00
PabstMirror
a3443cae43 Merge pull request #2780 from acemod/fixTimeInComments
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
PabstMirror
cfba7c01e8 Merge branch 'master' into settingsErrorChecking
Conflicts:
	addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
Jonathan Pereira
ce5364d7af Added PT-BR translations
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
2015-10-26 22:04:03 -02:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
PabstMirror
acc3504d7b Merge branch 'master' into fixFlashlightPrivates
Conflicts:
	addons/map/stringtable.xml
2015-10-19 13:59:15 -05:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
Glowbal
843eb16837 Merge pull request #2650 from acemod/setDefaultChannel
Set Default Channel at mission start
2015-10-18 12:28:13 +02:00
PabstMirror
da2d140a39 Cleanup unnecessary statement 2015-10-17 14:30:59 -05:00
PabstMirror
6ffde8150f Simplify Map Light Interactions 2015-10-14 14:36:40 -05:00
jokoho48
2dcdd224bd fix privates in Map module 2015-10-14 19:56:54 +02:00
PabstMirror
5d76395914 #2734 - Map effects / flashlights for TrippleHead 2015-10-12 11:27:38 -05:00
gienkov
251437c415 pl translation 2015-09-29 20:37:30 +02:00
PabstMirror
c0b78ecf3a Set Default Channel at mission start 2015-09-29 11:36:30 -05:00
PabstMirror
45e44251b6 Merge branch 'release'
Conflicts:
	addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
PabstMirror
97921aa665 #2503 - run BFT module on server 2015-09-18 12:18:43 -05:00
Ivan Navarro Cabello
463e21dd91 330 2015-09-16 12:40:30 +02:00
Glowbal
7e5ab07e32 Merge pull request #2387 from acemod/FixHCPPE
Fix that PPEffects Throw a error on HC
2015-09-15 21:04:37 +02:00
Glowbal
478b618e4b Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
Alessandro Foresi
89eb98a248 Added: IT more translation, medic partial
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
jokoho48
b7e02da1cc remove if (!hasInterface) from PFH
move ! in ()
2015-09-11 16:58:26 +02:00
KoffeinFlummi
63c2712360 Merge branch 'release' into portuguese 2015-09-10 21:59:30 +02:00