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

3.22.1-LIVE.9097523 | crusader_ #469

Merged
merged 11 commits into from
Mar 23, 2024
Merged

3.22.1-LIVE.9097523 | crusader_ #469

merged 11 commits into from
Mar 23, 2024

Conversation

greluc
Copy link
Collaborator

@greluc greluc commented Feb 14, 2024 •
edited
Loading

crusader_ part 1

#405

@greluc
3.22.1-PTU.9063902 | crusader_
0539107 
crusader_ part 1

Signed-off-by: Lucas Greuloch (greluc) <[email protected]>
@greluc greluc added Verbesserung Verbesserung einer bestehenden Übersetzung Entwurf PR ist noch nicht fertig PTU labels Feb 14, 2024
@greluc greluc self-assigned this Feb 14, 2024
@greluc greluc mentioned this pull request Feb 14, 2024
Open
@rjcncpt
Copy link
Owner

rjcncpt commented Feb 14, 2024

Moin. Ich würde formell verwenden für die Reputationstexte. @MaxM1211 wie siehst du das?

@MaxM1211
Copy link
Collaborator

Sehe ich ähnlich, jedoch würde ich dass von der Fraktion abhängig machen. Ist es eher ein Unternehmen -> formell, ist es eine Gruppe Rebellen eher informell

@rjcncpt
Copy link
Owner

rjcncpt commented Feb 14, 2024

Sehe ich ähnlich, jedoch würde ich dass von der Fraktion abhängig machen. Ist es eher ein Unternehmen -> formell, ist es eine Gruppe Rebellen eher informell

Finde ich gut

@greluc
Copy link
Collaborator Author

greluc commented Feb 16, 2024

Ihr verschwört euch gegen mich! :-P
Passe ich an. ;-)

greluc added 2 commits March 23, 2024 12:49
@greluc
Merge branch 'refs/heads/main' into greluc_crusader
7d8f41c 
# Conflicts:
#	ptu/global.ini
@greluc
crusader
1b55459 
Signed-off-by: Lucas Greuloch (greluc) <[email protected]>
@greluc greluc changed the title 3.22.1-PTU.9063902 | crusader_ 3.22.1-LIVE.9097523 | crusader_ Mar 23, 2024
greluc added 6 commits March 23, 2024 13:33
@greluc
crusader
e3c6dae 
Signed-off-by: Lucas Greuloch (greluc) <[email protected]>
@greluc
crusader
cc3c849 
Signed-off-by: Lucas Greuloch (greluc) <[email protected]>
@greluc
crusader
8111530 
Signed-off-by: Lucas Greuloch (greluc) <[email protected]>
@greluc
crusader
7b4396e 
Signed-off-by: Lucas Greuloch (greluc) <[email protected]>
@greluc
crusader
96aad62 
Signed-off-by: Lucas Greuloch (greluc) <[email protected]>
@greluc
crusader
f20edbe 
Signed-off-by: Lucas Greuloch (greluc) <[email protected]>
@greluc greluc marked this pull request as ready for review March 23, 2024 13:19
@greluc greluc added Prüfbar Wenn im PR keine Änderungen mehr gepusht werden LIVE and removed Entwurf PR ist noch nicht fertig PTU labels Mar 23, 2024
@greluc greluc requested review from rjcncpt and MaxM1211 March 23, 2024 13:19
@MaxM1211 MaxM1211 added In Review Wenn ein Reviewer am durchlesen ist and removed Prüfbar Wenn im PR keine Änderungen mehr gepusht werden labels Mar 23, 2024
MaxM1211
MaxM1211 requested changes Mar 23, 2024
View reviewed changes
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
@MaxM1211 MaxM1211 removed the In Review Wenn ein Reviewer am durchlesen ist label Mar 23, 2024
@MaxM1211 MaxM1211 added the Geprüft Wenn der PR durchgesehen wurde label Mar 23, 2024
@greluc
fix review
ab51a68 
Signed-off-by: Lucas Greuloch (greluc) <[email protected]>
@greluc greluc added Korrigiert Mitprüfungsbemerkungen wurden bearbeitet and removed Geprüft Wenn der PR durchgesehen wurde labels Mar 23, 2024
MaxM1211
MaxM1211 requested changes Mar 23, 2024
View reviewed changes
Copy link
Collaborator

@MaxM1211 MaxM1211 left a comment

Choose a reason for hiding this comment

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

Sorry, hab nicht alle einzeln markiert gehabt :-)

live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
live/global.ini Show resolved Hide resolved
@greluc
Copy link
Collaborator Author

greluc commented Mar 23, 2024

crusader_UGF_eliminateall_allies_desc_rehire=

Ja hätte ja auch selbst mal schauen können obs mehr gibt. ;-)

@greluc
fix review
d9ae11d 
Signed-off-by: Lucas Greuloch (greluc) <[email protected]>
MaxM1211
MaxM1211 approved these changes Mar 23, 2024
View reviewed changes
Copy link
Collaborator

@MaxM1211 MaxM1211 left a comment

Choose a reason for hiding this comment

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

LGTM 👍🏼

@greluc greluc merged commit 01d8506 into main Mar 23, 2024
4 checks passed
@greluc greluc deleted the greluc_crusader branch March 23, 2024 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MaxM1211 MaxM1211 MaxM1211 approved these changes

@rjcncpt rjcncpt Awaiting requested review from rjcncpt

Assignees

@greluc greluc

Labels
Korrigiert Mitprüfungsbemerkungen wurden bearbeitet LIVE Verbesserung Verbesserung einer bestehenden Übersetzung
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@greluc @rjcncpt @MaxM1211