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

Update cosmic_settings.ftl #715

Closed
wants to merge 3 commits into from
Closed

Update cosmic_settings.ftl #715

wants to merge 3 commits into from

Conversation

bittin
Copy link
Contributor

@bittin bittin commented Oct 22, 2024

Solve Merge conflict with the Swedish translation

Solve Merge conflict with the Swedish translation
Comment on lines +82 to +90
font-weight = Vikt
.thin = Tunn
.extra-light = Extra lätt
.light = Lätt
.normal = Normal
.medium = Medium
.semibold = Halvfet
.bold = Fet
.extra-bold = Extra fet
Copy link
Member

Choose a reason for hiding this comment

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

These do not exist anymore

font-style = Stil
.normal = Normal
.italic = Kursiv
.oblique = Sned
Copy link
Member

Choose a reason for hiding this comment

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

These do not exist anymore

font-stretch = Sträcka
.condensed = Förtätad
.normal = Normal
.expanded = Expanderad
Copy link
Member

Choose a reason for hiding this comment

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

These do not exist anymore

## Testinställningar

experimental-settings = Testinställningar
icons-and-toolkit = Utformning av ikoner och verktyg
interface-font = Systemets teckensnitt
monospace-font = Teckensnitt med jämna mellanrum
>>>>>>> master
Copy link
Member

Choose a reason for hiding this comment

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

Merge conflict syntax left over

font-config = Teckensnittskonfiguration
interface-font = System teckensnitt
monospace-font = Monospace teckensnitt
font-family = Teckensnittsfamilj
Copy link
Member

Choose a reason for hiding this comment

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

Not used


font-config = Teckensnittskonfiguration
interface-font = System teckensnitt
monospace-font = Monospace teckensnitt
Copy link
Member

Choose a reason for hiding this comment

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

Duplicate variable

### Appearance: Teckensnitt

font-config = Teckensnittskonfiguration
interface-font = System teckensnitt
Copy link
Member

Choose a reason for hiding this comment

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

Duplicate variable

@bittin
Copy link
Contributor Author

bittin commented Oct 22, 2024

Sorry, should look at this properly when i have more time, would be good with https://weblate.org/en-gb/
https://hosted.weblate.org/ or a translation system instead of doing everything manually tbh

@bittin bittin closed this by deleting the head repository Oct 27, 2024
@bittin
Copy link
Contributor Author

bittin commented Oct 27, 2024

to much mess see #725 instead for now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants