Commit Graph

116 Commits

Author SHA1 Message Date
PabstMirror
fd8d68c451 Merge branch 'master' into multipleDevices
Conflicts:
	addons/common/stringtable.xml
2015-05-14 15:38:13 -05:00
GieNkoV
ed1acd8c15 Some small errors fixed #2
Mainly tabs and wrong italian strings (got those from newest master)
2015-05-12 19:42:35 +02:00
GieNkoV
bc72c71e8e Fix small errors inside stringtables 2015-05-12 19:11:56 +02:00
Grzegorz Sikora
156bba3321 Yes/No to BOOL
Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/CfgVehicles.hpp
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml

Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml
2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
PabstMirror
de2a89613c ATragMX 2015-05-11 22:22:24 -05:00
PabstMirror
05f1b884fa Localization/ headers 2015-05-10 15:17:50 -05:00
Alessandro Foresi
2dd06babec Added: Italian translations completed.
Fixed: BOM markers where missing
2015-05-10 11:44:46 +02:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +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
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
1d434949de Some Italian Translation's Changes 2015-04-28 17:46:35 +02:00
VyMajoris
ba89bc8faa Added - Myself to AUTHORS.txt 2015-04-26 03:15:25 -03:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
Tachii
2466d83cac Update stringtable.xml 2015-04-16 18:19:11 +03: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
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
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +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
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +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
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +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
7523dd011f Update stringtable.xml 2015-04-13 02:06:17 +02:00
Anthariel
8d79fd242a Update stringtable.xml
Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)
2015-04-12 18:18:52 +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
licht-im-Norden87
7eaee37ff6 Update stringtable.xml 2015-04-12 13:48:59 +02:00
PabstMirror
78b64ea273 Missing English 2015-04-12 01:36:41 -05:00
bux578
2fc7f44c39 french translation, tabler 4 spaces test 2015-04-12 07:50:23 +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
KoffeinFlummi
5108137302 Merge https://github.com/Ricciardino/ACE3 into italian-merge 2015-04-12 04:38:46 +02:00
licht-im-Norden87
bd07e18b43 Update stringtable.xml 2015-04-12 03:26: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
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
Riccardo Petricca
d9e78e511e Added italian translation to the last terms.
Added italian translation to the last added terms.
2015-04-10 21:13:03 +02:00
ruPaladin
d198cb25e9 Update stringtable.xml 2015-04-10 20:37:21 +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
Grzegorz
95be641918 common PL translation 2015-04-10 03:52:30 +02: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
ae7af34a11 Added - Portuguese translation to common/Stringtable
Everything translated. Even the banana.
2015-04-09 20:53:44 -03:00
Legolasindar
5f5ce47bec Update stringtable.xml
fixed one term in spanish
2015-04-10 01:26:06 +02:00
Legolasindar
65b3566d41 Update stringtable.xml
fixed spanish terms.
2015-04-10 01:24:37 +02:00
Legolasindar
cef9a6454a Update stringtable.xml
Updated spanish terms, on moved english to first raws.
2015-04-10 00:38:24 +02:00
licht-im-Norden87
3c4656522f Stringtable: German additions 2015-04-09 23:33:36 +02:00
licht-im-Norden87
00c37e0b9d Update stringtable.xml 2015-04-09 23:12:00 +02:00
bux578
92da20ce62 translations
#367
2015-04-07 10:02:33 +02:00
bux578
9ce2e38814 removed <orignal> language entry 2015-04-07 09:27:26 +02:00
PabstMirror
c1abb2669d #340 - Fix stringtables 2015-04-06 11:03:04 -05:00
Glowbal
f652ae89d1 Banana 2015-03-26 23:14:22 +01:00
Glowbal
5e0eb7323a Added option to toggle between progressbar top and bottom 2015-02-22 14:38:48 +01:00
Glowbal
9d44ec18b8 Added a default text color setting 2015-02-22 13:35:05 +01:00
Glowbal
a81c1fbef5 Overhauled AGM hint. 2015-02-19 21:38:51 +01:00
Glowbal
155503d4a1 Merged GUI into common.
Removed unnecessary GUI functions.
Updated displayIcon function to be more dynamic
Added client side settings for displaying icons.
2015-02-14 20:06:55 +01:00
Nicolás Badano
33485f6d3f common: remove AGM key handling routines and remaining stuff from AGM options menu 2015-01-24 15:32:06 -03:00
Thomas Kooi
afc103a946 Added CSE common port. 2015-01-17 00:21:47 +01:00
commy2
cf8259882e formating 2015-01-12 22:34:01 +01:00
commy2
7954988130 rename core to common 2015-01-12 19:22:58 +01:00