Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translations - German #6920

Merged
merged 88 commits into from
Jun 8, 2019
Merged

Translations - German #6920

merged 88 commits into from
Jun 8, 2019

Conversation

C0kkie
Copy link
Contributor

@C0kkie C0kkie commented Apr 3, 2019

This will add all missing german translations for the medical system

@PabstMirror PabstMirror added the kind/translation Release Notes: **TRANSLATIONS:** label Apr 3, 2019
@PabstMirror PabstMirror added this to the Medical Rewrite milestone Apr 3, 2019
@@ -4,6 +4,7 @@
<Container name="Settings">
<Key ID="STR_ACE_Medical_damage_subCategory">
<English>Damage Threshold</English>
<German>Schaden</German>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the English translation wrong here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like "threshold" got lost in translation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any suggestions for good translation?

Copy link
Contributor

@dedmen dedmen Apr 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Schadensschwelle
That is.. If the english translation is correct. It seems to be wrong though. The damage category has many things, not just damage threshold?

PabstMirror and others added 4 commits April 3, 2019 21:04
* RHS Compat - Add 2 rnd hellfire pylon

Close #5957

* change magwell name

* gvar->addon
* Fastroping - Add user setting to confirm cutting ropes

* always confirm

* fix

* Update stringtable.xml
addons/medical_gui/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_gui/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_gui/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_gui/stringtable.xml Show resolved Hide resolved
addons/medical_gui/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/ai/stringtable.xml Outdated Show resolved Hide resolved
addons/zeus/stringtable.xml Outdated Show resolved Hide resolved
addons/zeus/stringtable.xml Outdated Show resolved Hide resolved
addons/zeus/stringtable.xml Outdated Show resolved Hide resolved
C0kkie and others added 8 commits April 21, 2019 15:13
* Refuel - Drop nozzle at unit's feet if no valid pos found

Fix #6944

* Update fnc_dropNozzle.sqf

* Update addons/refuel/functions/fnc_dropNozzle.sqf

Co-Authored-By: PabstMirror <[email protected]>
* Common - Don't add UAV AI to localUnits array

* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf

Co-Authored-By: PabstMirror <[email protected]>
#6932)

* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion

* Prevent FRIES from clipping into Ghost Hawk right door

* UNequipFRIES

* Remove fastroping checkVehicleThread

* Document FRIES equip and unequip functions
C0kkie and others added 6 commits April 26, 2019 20:02
 Conflicts:
	addons/arsenal/stringtable.xml
	addons/common/stringtable.xml
	addons/cookoff/stringtable.xml
	addons/medical/stringtable.xml
	addons/medical_ai/stringtable.xml
	addons/medical_blood/stringtable.xml
	addons/medical_damage/stringtable.xml
	addons/medical_feedback/stringtable.xml
	addons/medical_gui/stringtable.xml
	addons/medical_statemachine/stringtable.xml
	addons/medical_status/stringtable.xml
	addons/medical_treatment/stringtable.xml
@PabstMirror
Copy link
Contributor

Conflicts fixed, some may have been lost in medical_treatment due to changes/rewordings

@PabstMirror PabstMirror changed the title Add all missing german translations Translations - German Jun 8, 2019
@PabstMirror PabstMirror merged commit f6b35a6 into acemod:master Jun 8, 2019
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
* Add all missing german translations for the ace medical system

* RHS Compat - Add 2 round hellfire to pylon options (#6893)

* RHS Compat - Add 2 rnd hellfire pylon

Close #5957

* change magwell name

* gvar->addon

* Fastroping - Add user setting to confirm cutting ropes (#6876)

* Fastroping - Add user setting to confirm cutting ropes

* always confirm

* fix

* Update stringtable.xml

* compatibility with CBA scripted 2d optics framework

* compatibility with CBA scripted 2d optics framework

* Bewusstlosstatus -> Bewusstlosigkeit

* Verblutungseffekt -> Blutungs effekt

* Aktivitere ACE Sanitäter Aktionen -> Aktiviere Sanitäter Aktionen

* Sanitätermenüs -> Sanitätsmenü

* kritsche -> kritische

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Add missing german translations for advanced fatigue, ai, arsenal & ballistics

* Update addons/ai/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: C0kkie <[email protected]>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Add missing german translations for ace cargo

* Add missing german translation for vehicles

* Add missing german translation for weaponselect

* Add missing german translations für ace repair

* Add missing german translations for ace quickmount

* Add missing german translations for ace explosives

* Add missing german translations for ace common

* Ace flashlight missing german translation

* Add missing german translations for ace scopes

* add missing translations for ace respawn

* Add missing german translations for ace overpressure

* ACE Nametags german translation

* .

* ace magazinerepack german translation

* ace interaktion german translations

* add missing german translation for ace interaction menu

* ACE Hearing german translations

* Update stringtable.xml

* Update stringtable.xml

* Missing german translation in ace dogtags

* Missing german translations ace hot

* ace pylons missing german translations

* ACE Cook off German Translations

* zeus german translations

* Fast roping german translations

* gforces german translations

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Map - Don't enable map light for parachutes (#6961)

* Refuel - Drop nozzle at unit's feet if no valid pos found (#6957)

* Refuel - Drop nozzle at unit's feet if no valid pos found

Fix #6944

* Update fnc_dropNozzle.sqf

* Update addons/refuel/functions/fnc_dropNozzle.sqf

Co-Authored-By: PabstMirror <[email protected]>

* Common - Don't add UAV AI to localUnits array (#6951)

* Common - Don't add UAV AI to localUnits array

* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf

Co-Authored-By: PabstMirror <[email protected]>

* Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries (#6932)

* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion

* Prevent FRIES from clipping into Ghost Hawk right door

* UNequipFRIES

* Remove fastroping checkVehicleThread

* Document FRIES equip and unequip functions

* Update stringtable.xml

* Nightvision german translations

* Update stringtable.xml

* remove non-stringtable stuff ???
@PabstMirror PabstMirror modified the milestones: Medical Rewrite, 3.13.0, 3.13.0-temp3 Dec 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/translation Release Notes: **TRANSLATIONS:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants