Commit Graph

285 Commits

Author SHA1 Message Date
BaerMitUmlaut
012ce9fb16 Removed old occurances of AGM and CSE 2016-05-03 21:38:36 +02:00
BlackWindowS
c61e7b5104 Tweaked & added translations
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
PabstMirror
147cd1a5af Hide categories that have no user settable options 2016-02-27 18:06:02 -06:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
commy2
c45523475f manual merge 2016-02-22 16:06:30 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
commy2
dd10fac470 use DisplayLoad for main menu box and to disable options when world=Empty 2016-02-21 23:28:02 +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
licht-im-Norden87
51b57b962b Update stringtable.xml 2016-02-10 17:32:19 +01:00
licht-im-Norden87
cabbc4b6a9 optionsmenu 2016-02-10 17:31:26 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
ProfessorCZ
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +01:00
commy2
2b05f6f451 fix isNil capitalization 2015-11-30 17:22:16 +01:00
commy2
5e41643cff fix pushBack capitalization 2015-11-30 17:21:28 +01:00
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
Thomas Kooi
cef01baf0b Merge pull request #2856 from acemod/isEqualTypeRepalcement
1.54 - Replace typeName with isEqualType
2015-11-28 20:36:07 +01:00
PabstMirror
a42c2153cc Error handling for bad setting values array 2015-11-28 01:57:15 -06:00
PabstMirror
5850f78c1f Merge branch 'master' into isEqualTypeRepalcement 2015-11-27 21:08:21 -06:00
PabstMirror
c4117e1283 Merge branch 'master' into settingsErrorChecking
Conflicts:
	addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
kaban
e2763dde27 Russian Translations - Update 2015-11-05 03:28:53 +03:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
esteldunedain
a621a0c693 Fixes to spanish translations 2015-09-18 13:36:57 -03:00
Ivan Navarro Cabello
463e21dd91 330 2015-09-16 12:40:30 +02:00
Glowbal
16b7bb389c Merge pull request #2428 from acemod/FixMainMenuInfo151
Fix main menu info151
2015-09-14 23:30:00 +02:00
PabstMirror
f7bd557a30 Fix some stringtable weirdness 2015-09-14 16:11:43 -05:00
Alessandro Foresi
89eb98a248 Added: IT more translation, medic partial
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
KoffeinFlummi
63c2712360 Merge branch 'release' into portuguese 2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd Merge branch 'release' into czech 2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
Jonathan Pereira
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03:00
[OMCB]kaban
6f7437bb80 Fix due to review 2015-09-05 04:57:07 +03:00
kaban
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
kaban
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
ProfessorCZ
44fa520bdd Czech Translations - Update 2015-09-03 01:20:24 +02:00
jokoho48
3f4d0af940 prevent Issues with other mods 2015-09-01 01:03:34 +02:00
jokoho48
afee398b11 woops 2015-09-01 00:51:32 +02:00
jokoho48
5d612abd02 posible Fix for #2310 2015-09-01 00:42:13 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
PabstMirror
5d104106c5 #2188 - Fix Exporting Color Arrays 2015-08-24 00:58:45 -05:00
gienkov
cf585790db fixes done 2015-08-22 11:41:15 +02:00
gienkov
75c31c10fd optionsmenu and repair first version of translation 2015-08-22 00:17:01 +02:00
jonpas
b627e32a00 Added shared logistics categories 2015-08-19 16:54:44 +02:00
bux578
ec29890780 Merge pull request #2128 from acemod/gienkov-pl-translation-5
Gienkov pl translation 5
2015-08-16 08:54:47 +02:00
PabstMirror
660d048670 Options Menu - Fix Colors when category selected 2015-08-15 03:21:03 -05:00
PabstMirror
763f793d0e Localize Catagoires in loadSettingsLocalizedText
Minor, but allows us to use CSTRINGS in configs for consistancy
2015-08-13 13:20:37 -05:00
PabstMirror
a908863317 Use proper lnbXXX commands 2015-08-11 04:15:55 -05:00
PabstMirror
bdca10eac4 Close Client Settings When open Server Settings 2015-08-11 01:38:31 -05:00
PabstMirror
2565a80a22 #2098 - Option Menu Fixes for categories
Use lbValue to store the index of the filtered selection
2015-08-10 17:19:30 -05:00
gienkov
49668a25f8 Merge remote-tracking branch 'origin/master' into pl-translation-5 2015-08-09 22:36:41 +02:00
PabstMirror
c949daae1f OptionMenu C->LStrings 2015-08-08 19:57:57 -05:00
gienkov
1c0a6fb457 PL translation of common, medical_menu, optionsmenu 2015-08-09 01:47:55 +02:00
Glowbal
c0562aaf6c clean up debug messages 2015-08-08 20:31:19 +02:00
PabstMirror
c6be0bbb8c Merge branch 'master' into add-category-optionsmenu
Conflicts:
	addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
	addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
2015-08-08 12:39:14 -05:00
PabstMirror
feceff2746 Polish the stringtable 2015-08-08 12:36:42 -05:00
jonpas
1aecd54fc3 Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common 2015-08-08 18:02:20 +02:00
Glowbal
e8961e3d0e Use display instead of just idc 2015-08-08 13:41:25 +02:00
Glowbal
25597704ed Added fail save for incorrect string value input 2015-08-08 13:07:40 +02:00
Glowbal
e7a607ca35 Finalized server export category select 2015-08-08 13:07:22 +02:00
Glowbal
0601aa80bb Localized All categories string
Enabled categories for config export menu
2015-08-08 11:52:23 +02:00
Glowbal
38b9fdab4d fixes #1948 2015-08-08 11:51:31 +02:00
PabstMirror
a3a481f96d Some fixes 2015-08-07 15:08:52 -05:00
Glowbal
d125b9ad9c Add category to options menu. Initial work. 2015-08-07 21:14:45 +02:00
Harakhti
2b23958fd1 Row 2
It gets tedious after a while, especially if your language lacks
technical terms. That or my B2 language exam isn't good enough.
2015-07-30 16:06:32 +02:00
Harakhti
d0f91c5ebf Row 1
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
ViperMaul
92940ea1a9 Removed improper translations
#1738
2015-07-28 15:17:22 +01:00
ViperMaul
675996d67b Adding HeadBugFix button to the ACE Options dialog (missing file)
#1738
2015-07-28 15:17:20 +01:00
ViperMaul
c9d9f78e5b Add headBugFix button to ACE Options Dialog #1738 2015-07-28 15:17:19 +01:00
PabstMirror
1008567cba Merge pull request #1847 from acemod/optionsOnIntroOutro
Show Options on Intro/Outro in Missions
2015-07-25 12:49:20 -05:00
KoffeinFlummi
9805a8270a Merge branch 'master' into german-merge 2015-07-25 19:35:03 +02:00
PabstMirror
46cee06f07 #1812 - Show Options on Intro/Outro 2015-07-12 10:26:08 -05:00
ProfessorCZ
89a9218e59 CZ Translation - Update 2015-07-04 15:56:00 +02:00
gienkov
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
ToasterBR
f4a51d57ef Translation to Brazilian Portuguese (PT-BR)
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
Macusercom
500504d93b Further improvements as suggested for German translation 2015-06-18 00:43:23 +02:00
Macusercom
09f7473d7b Added German translations 2015-06-16 03:06:47 +02:00
Ivan Navarro Cabello
76f7962dac Updated spanish stringatable
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
2015-06-14 13:52:55 +02:00
PabstMirror
dff99c4736 Tweak HTML Size 2015-06-13 20:41:57 -05:00
PabstMirror
f811fc797e Suppress optionsmenu debug 2015-06-13 15:03:22 -05:00
PabstMirror
0c45d2308a Merge pull request #1150 from acemod/mainMenuVersionHTML
Show Version / HTML Git Version on main menu
2015-06-13 14:07:36 -05:00
ProfessorCZ
531372b2a3 CZ - Translation
Already in README
2015-06-12 14:50:50 +02:00
PabstMirror
f48777462f Text Spacing 2015-06-11 23:59:51 -05:00
Ivan Navarro Cabello
d15bae105d Updated spanish translation
Updated spanish translation
2015-06-08 12:43:07 +02:00
PabstMirror
24cdf77de0 Move to right side, directly under BIS news 2015-06-06 23:28:52 -05:00
PabstMirror
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05:00
PabstMirror
a0f4ea4e93 Resize, User Option, Localization 2015-06-05 17:23:51 -05:00
PabstMirror
3c3affa69f Merge branch 'master' into mainMenuVersionHTML 2015-06-05 16:48:59 -05:00
gienkov
c1a7374404 Merge remote-tracking branch 'upstream/master' into pl-translation-1
Conflicts:
	addons/interact_menu/stringtable.xml
2015-06-05 09:40:50 +02:00
PabstMirror
1221498357 Dump settings to debug 2015-06-04 15:31:10 -05:00
jonpas
9fbf256acd Merge branch 'master' into macroSTR
Conflicts:
	addons/hearing/functions/fnc_putInEarplugs.sqf
	addons/interact_menu/ACE_Settings.hpp
2015-06-04 17:13:09 +02:00
gienkov
46dbd3113c Fix 2015-06-04 01:38:57 +02:00