SilentSpike
bfce854be3
Localise module messages
2015-06-01 20:50:19 +01:00
SilentSpike
eefe995a0c
Transfer curator functionality from ace_captives
2015-06-01 20:44:50 +01:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
Macusercom
489751f5aa
More German string fixed
...
As recommended...
2015-05-28 16:21:53 +02:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
PabstMirror
c4e5e9a7ac
#1298 - Reset handcuffs on respawn
2015-05-18 22:02:50 -05:00
GieNkoV
1610221a70
Remove duplicated strings
2015-05-12 20:01:10 +02:00
Grzegorz Sikora
44466e8be8
Remove tabs and repair errors @Glowbal found
...
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
addons/optionsmenu/stringtable.xml
2015-05-12 18:27:27 +02:00
Grzegorz Sikora
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
jaynus
8e7763af08
Removed: systemChat debug in captive
2015-05-11 13:50:24 -07:00
ViperMaul
b0051a6638
Merge pull request #1094 from acemod/fixUnSurrender
...
Fix not being able to UnSurrender (currentWeapon)
2015-05-11 08:39:39 -07: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
643df71932
Added: Italian translation from Blackedsoul p#20
2015-05-10 11:05:16 +02:00
PabstMirror
59adf92862
Fix not being able to UnSurrender (currentWeapon)
2015-05-10 01:47:50 -05:00
Alessandro Foresi
6695a8793b
Added: Some italian translastions
2015-05-09 23:43:03 +02:00
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
ulteq
2c97b20781
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +02:00
KoffeinFlummi
b263ac6847
Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
addons/common/stringtable.xml
2015-04-29 12:57:48 +02:00
KoffeinFlummi
c854d2208f
Merge branch 'patch-4' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
addons/captives/stringtable.xml
2015-04-29 12:54:20 +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
NukeDev
0b4bb6e4c9
Italian's Translation fixes
...
atragmx, attach, ballistics, captives languages fixes
2015-04-28 19:40:36 +02:00
PabstMirror
ca980379c8
Minor captive cleanup
2015-04-25 16:03:21 -05:00
KoffeinFlummi
06a4f3d10e
Remove tabler comments.
2015-04-20 15:48:50 +02:00
Grzegorz Sikora
8530684fa6
PL fix #2
2015-04-19 23:09:11 +02:00
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
ruPaladin
e38a6fc62b
one more russian fix
2015-04-17 12:01:01 +03:00
PabstMirror
638433614c
Some missing private defines.
2015-04-16 12:36:16 -05:00
Tachii
def2f9c28e
Update stringtable.xml
2015-04-16 18:13:53 +03:00
PabstMirror
0076be6a86
Fix stringtables
2015-04-15 17:08:35 -05:00
KoffeinFlummi
9e6ae52ca5
Merge branch 'patch-6' of https://github.com/ramius86/ACE3 into italian-merge
...
Conflicts:
addons/captives/stringtable.xml
2015-04-15 22:07:42 +02:00
PabstMirror
e84689a771
#544 - Change ERROR warning to debug trace
2015-04-15 11:46:06 -05: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
f328d302e1
Update stringtable.xml
...
Italian translation
2015-04-15 10:42:25 +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
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
b93cf4fb4a
Merge branch 'polish-merge'
2015-04-13 13:01:17 +02:00
KoffeinFlummi
118b5509ea
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-13 13:00:59 +02:00
PabstMirror
7111cdd8ff
#540 - remove debug spam
2015-04-13 03:16:33 -05:00
Anthariel
3db8f4ad44
Update stringtable.xml
...
Added: Some missing french translation.
2015-04-12 18:10:41 +02:00
esteldunedain
d6ec8d771e
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-12 11:14:31 -03:00
esteldunedain
91df52056b
Only display "Surrender" action if the player is not holding a weapon.
2015-04-12 11:13:54 -03: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
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