Commit Graph

2082 Commits

Author SHA1 Message Date
VyMajoris
37858ec430 Added - Portuguese translation to laser_selfdesignate 2015-04-10 05:04:15 -03:00
VyMajoris
f7166047dc Added - Portuguese translation to Kestrel ApproximateTemp 2015-04-10 05:01:11 -03:00
VyMajoris
ec8e2707f8 Added - Portuguese translation to inventory 2015-04-09 23:05:47 -03:00
VyMajoris
c260ff89ba Added - Portuguese Translation to Interact_menu 2015-04-09 23:00:13 -03:00
VyMajoris
be7a579f7d Added - Portuguese translation to LaseTarget
There is no way to translate Lase Target in a faithful way to portuguese. If "Marcar com laser" is too big, "Marcar Alvo" is a solid alternative for all intents and purposes...
2015-04-09 22:50:35 -03:00
VyMajoris
4198a942b3 Added/Changed - explosives Portuguese Translation
Added "Dead Man's Switch" and "Explosives_Pickup" PT translation and corrected some stuff.
2015-04-09 22:42:21 -03:00
VyMajoris
c8c183863c Changed - Dragging drop Portuguese Translation
Changed from "Largar" to "Soltar". "Largar" seems a little to harsh when dealing with humans.

"STR_ACE_Dragging_UnableToDrag" Commented code unchanged
2015-04-09 22:28:45 -03:00
VyMajoris
0dbb4579c4 Added - Portuguese translation Disposable 2015-04-09 22:25:37 -03:00
VyMajoris
b8f2bd9636 Added - Portuguese translation to cargo door
Confused if it is a ramp or a door. Translated to as if it is a door. Should work.
2015-04-09 22:18:46 -03:00
VyMajoris
f98b9c27c6 Added - Portuguese translation to Captive surrendering
I need more context on "STR_ACE_Captives_Zeus_OnlyInfentry" and "STR_ACE_Captives_Zeus_OnlyAlive" to translate.
Are those texts talking to the player or is just a description for an action?
2015-04-09 22:16:14 -03:00
VyMajoris
c1941f2719 Added - Portuguese translation to common/Stringtable
I see that the english description for the banana is from the Wikipedia. If wanted I can use the portuguese version from Wikipedia.
2015-04-09 22:12:54 -03:00
VyMajoris
f0a97bd855 Added - Portuguese translation to Attach Failed 2015-04-09 20:20:08 -03:00
PabstMirror
c511431e61 Fix encoding problem
Not sure why, but it was decoding the \a's: Warning:
z\ace\addons\main\config.cpp Line 556: ['MAIN',_this] execVM
'\zceddons\mainbout.sqf';-NOGIT
2015-04-09 17:17:33 -05:00
Felix Wiegand
309eb7b3bf Merge pull request #399 from licht-im-Norden87/patch-1
Stringtable: German additions
2015-04-10 00:06:43 +02:00
Nicolás Badano
b93020091b Merge pull request #401 from Legolasindar/patch-1
Update stringtable.xml
2015-04-09 19:06:27 -03:00
Legolasindar
7b4d62c46c Update stringtable.xml
Fixed spanish terms
2015-04-10 00:05:47 +02:00
Felix Wiegand
1d7f6c5404 Woops 2015-04-09 23:09:09 +02:00
licht-im-Norden87
2c7df9da6a Stringtable: German additions 2015-04-09 23:02:28 +02:00
Felix Wiegand
8177178cea Update getting-started.md 2015-04-09 22:29:55 +02:00
Felix Wiegand
05228b147d Update links in README 2015-04-09 22:27:16 +02:00
Felix Wiegand
0de99fe8a0 Update modules.md 2015-04-09 22:14:12 +02:00
Felix Wiegand
3554a3bfe9 Update modules.md 2015-04-09 22:14:01 +02:00
Glowbal
84c8e02328 Merge pull request #396 from KoffeinFlummi/medicalCleanup
Medical cleanup
2015-04-09 22:13:31 +02:00
PabstMirror
253614d442 Explosives: cancel placement when opening interact
"zoomtemp" doesn't work for me, so this gives an additional way to
cancel.  It was also possible to start planting multiple explosives.
made a small change to make QGVAR(PlantingExplosive) always reset
2015-04-09 14:48:27 -05:00
Glowbal
d94943a9ff getting hitpoint damage on non existing hitpoint returns type instead of bool 2015-04-09 21:38:35 +02:00
KoffeinFlummi
e836d2627d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-09 21:38:12 +02:00
KoffeinFlummi
b54d1e8786 Nicer output in build.py 2015-04-09 21:37:54 +02:00
Felix Wiegand
1b94e2e33a Update README.md 2015-04-09 21:35:56 +02:00
KoffeinFlummi
63861a9fc0 Remove TO_MERGE 2015-04-09 21:33:25 +02:00
KoffeinFlummi
30862b4bfc Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-09 21:26:19 +02:00
KoffeinFlummi
5e918eb707 Remove AGM from TO_MERGE folder 2015-04-09 21:25:55 +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
Felix Wiegand
d81ed9f969 Merge pull request #397 from KoffeinFlummi/master-docs
Add documentation to master branch
2015-04-09 21:17:30 +02:00
KoffeinFlummi
8ca882248a Add documentation to master branch 2015-04-09 21:09:49 +02:00
Glowbal
0926397ab4 Removed deadcode and obvious comments 2015-04-09 20:13:46 +02:00
Glowbal
39cbf21278 Removed deprecated carry functions 2015-04-09 20:12:30 +02:00
commy2
2d265ec6c2 prevent ai fro being stuck, #290 2015-04-09 16:54:50 +02:00
commy2
b41c6280ba prvent falling ai from being stcuk, fix #290 2015-04-09 16:52:59 +02:00
commy2
147fcdfa0c Merge pull request #392 from KoffeinFlummi/requiredaddons
sorting out required addons for modularity
2015-04-09 16:37:47 +02:00
esteldunedain
f0cc0941e5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-09 10:05:38 -03:00
esteldunedain
8519bb04b7 Merge remote-tracking branch 'origin/removeRecoil'
Conflicts:
	addons/recoil/config.cpp
2015-04-09 10:05:14 -03:00
Nicolás Badano
c57044fd4a Merge pull request #390 from KoffeinFlummi/betterMapColors
Improve map colors by taking them from A2
2015-04-09 09:52:06 -03:00
esteldunedain
6447b39d1a Merge branch 'master' of github.com:KoffeinFlummi/ACE3
Conflicts:
	addons/scopes/XEH_postInit.sqf
2015-04-09 09:32:58 -03:00
esteldunedain
34639c153c Allow holding scope adjustment keys 2015-04-09 09:31:18 -03:00
Felix Wiegand
3a289e811e Merge pull request #376 from KoffeinFlummi/tools-cleanup
Tools cleanup
2015-04-09 13:39:38 +02:00
KoffeinFlummi
3a871eed58 Merge branch 'master' into tools-cleanup 2015-04-09 13:37:19 +02:00
commy2
5ea35a01bb sorting out required addons for modularity 2015-04-09 13:23:29 +02:00
esteldunedain
99aa439561 Improve map colors taking them from A2 2015-04-09 01:28:36 -03:00
PabstMirror
2033676e81 another undef to Make PBO-Project Happy 2015-04-08 18:20:00 -05:00
commy2
c86687afbb Merge pull request #269 from KoffeinFlummi/142inheritance
142 - fix inheritance changes
2015-04-08 22:02:05 +02:00