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.

Sign up for GitHub

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

Jump to bottom

Translation - Improve German translation #506

Merged
merged 34 commits into from
Apr 2, 2024
Merged

Translation - Improve German translation #506

merged 34 commits into from
Apr 2, 2024

Conversation

OverlordZorn
Copy link
Contributor

🇩🇪
got slightly sidetracked while working on the german guide 😅

OverlordZorn and others added 21 commits February 14, 2023 11:04
@OverlordZorn
Update stringtable.xml
a532652 
German Language Refinement
@OverlordZorn
Giftgas -> Senfgas
4fe0539
@OverlordZorn
Update stringtable.xml
9bf03bc
@OverlordZorn
Merge remote-tracking branch 'upstream/dev-Tomcat' into dev-Tomcat
ebbbd6f
@OverlordZorn
German ChemWarfare Tripwire Update
d028a6c
@OverlordZorn
Merge branch 'dev-Tomcat' of https://github.com/PulsarNeutronStar/KAM …
51b89ab 
…into dev-Tomcat
@OverlordZorn
Merge branch 'Tomcat-SG:dev-Tomcat' into dev-Tomcat
5d00964
@OlafZigel
Deutsch 05.03.2024
65aaa4a
@OlafZigel
Updated Translation
9ae56a9
@OlafZigel
Updated Translation V3
67ec223
@MiszczuZPolski
fix indent
af83f85
@MiszczuZPolski
fix duplicate
d35ab56
@OlafZigel
Update Translation V4
964c9bf 
fixed indent [addons/pharma/stringtable.xml] line: 1111

deleted duplicate [addons/airway/stringtable.xml] line: 1330
@OlafZigel
Merge branch 'Translation-German' of https://github.com/OlafZigel/KAM …
c44ded4 
…into Translation-German
@OlafZigel
Updated Translation V5
43efc5d
@OlafZigel
Updated Translation V6
666a113
@OlafZigel
Updated Translation V7
2d4ee20
@OlafZigel
Merge branch 'dev-Tomcat' into Translation-German
f58a557
@OverlordZorn
🇩🇪
41a4c3f
@OverlordZorn
Merge branch 'dev-Tomcat' into translation-ger-hotfix
298911f
@OverlordZorn
missed some
f1e92b8
@OverlordZorn OverlordZorn changed the title stringtable - 🇩🇪 Translation - 🇩🇪 - Filling some gaps and a bit of polish here and there Mar 26, 2024
@BlueTheKing BlueTheKing added the area/translations Release Notes: **TRANSLATIONS:** label Mar 28, 2024
@BlueTheKing BlueTheKing added this to the 2.14.0 milestone Mar 28, 2024
@BlueTheKing BlueTheKing changed the title Translation - 🇩🇪 - Filling some gaps and a bit of polish here and there Translation - Improve German translation Mar 28, 2024
@MissHeda
Copy link
Contributor

Why did you open a new translation PR when the is currently still one pending for German translation?
Won't this one interfere with the one that is already open?

@MissHeda MissHeda self-assigned this Mar 29, 2024
@MissHeda MissHeda modified the milestones: 2.14.0, Ongoing Mar 29, 2024
@OverlordZorn
Copy link
Contributor Author

OverlordZorn commented Mar 29, 2024 •
edited
Loading

Why did you open a new translation PR when the is currently still one pending for German translation? Won't this one interfere with the one that is already open?

thats not merged yet?

also, Atemwegsverlegungswahrscheinlichkeit triggered me

I dont mind reiterating over my PR once that one gets resolved.

@OlafZigel
Copy link
Contributor

OlafZigel commented Mar 29, 2024 •
edited
Loading

Why did you open a new translation PR when the is currently still one pending for German translation? Won't this one interfere with the one that is already open?

thats not merged yet?

also, Atemwegsverlegungswahrscheinlichkeit triggered me

I dont mind reiterating over my PR once that one gets resolved.

If you want we could update my PR with the problems you fixed :D
Because I can't understand what the problem is

@OverlordZorn
Copy link
Contributor Author

OverlordZorn commented Apr 2, 2024 •
edited
Loading

I have merged @OlafZigel 's PR #493 into this PR, picking the best of both worlds.
I have merged tomcat-dev into this PR beforehand, meaning any accidental changes of the Japanese Lines should be reverted.

Afterwards, I double checked the files with tabler, no errors occour, meaning there are no duplicate entries left.

@MiszczuZPolski 
I dont know whats going on here:
![grafik](https://github.com/KAT-Advanced-Medical/KAM/assets/56258612/3ac5e61b-8641-409c-81a4-8ae415588098)

My local version seems fine
![grafik](https://github.com/KAT-Advanced-Medical/KAM/assets/56258612/00dd2188-e548-4d49-8c2a-da6597eddeb9)

dev-tomcat version:
https://github.com/KAT-Advanced-Medical/KAM/blob/b244f4360ac88d2631d88abfb81d6d2ad788f6a5/addons/circulation/stringtable.xml#L2047-L2051

Nvm, had an old version of KAM on my fork. now its not complaining anymore.

OlafZigel
OlafZigel reviewed Apr 2, 2024
View reviewed changes
addons/pharma/stringtable.xml Outdated
@@ -2754,7 +2756,7 @@
<Italian>Possibilità di ostruzione della IV senza prima aver svolto uno sciacquo salino</Italian>
<French>Chance de blocage des IV dû à une administration intra-veineuse de médicaments sans rinçage à la solution saline</French>
<Korean>식염수 주입 없이 약물 투여로 인한 IV 막힘 확률</Korean>
<German>Möglichkeit einer Verstopfung der IV durch Medikamentengabe ohne Kochsalzspülung</German>
<German>Möglichkeit einer Okklusion der IV durch Medikamentengabe ohne Kochsalzspülung</German>
Copy link
Contributor

@OlafZigel OlafZigel Apr 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Es ist eine Verstopfung des IV. Also würde ich das auch dabei belassen :D

Copy link
Contributor Author

Choose a reason for hiding this comment

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

is das nich von dir?

Copy link
Contributor

Choose a reason for hiding this comment

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

Kann sein.. bitte ändere das um :D

@MiszczuZPolski MiszczuZPolski modified the milestones: Ongoing, 2.14.1 Apr 2, 2024
@OlafZigel OlafZigel mentioned this pull request Apr 2, 2024
Closed
@OverlordZorn
Copy link
Contributor Author

resolve #493

@MiszczuZPolski MiszczuZPolski merged commit df44bb7 into KAT-Advanced-Medical:dev-Tomcat Apr 2, 2024
3 checks passed
@OverlordZorn OverlordZorn deleted the translation-ger-hotfix branch April 2, 2024 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@OlafZigel OlafZigel OlafZigel left review comments

Assignees

@MissHeda MissHeda

Labels
area/translations Release Notes: **TRANSLATIONS:**
Projects
None yet
Milestone
2.14.1
Development

Successfully merging this pull request may close these issues.
5 participants
@OverlordZorn @MissHeda @OlafZigel @BlueTheKing @MiszczuZPolski