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

Switch German to Weblate #91

Merged
merged 1 commit into from
Feb 9, 2023
Merged

Switch German to Weblate #91

merged 1 commit into from
Feb 9, 2023

Conversation

rtsisyk
Copy link
Member

@rtsisyk rtsisyk commented Jan 2, 2023

This patch overwrites German Markdowns with translations from Weblate. Any further edits should be done through Weblate.

@rtsisyk rtsisyk requested a review from a team January 2, 2023 09:13
@cloudflare-workers-and-pages
Copy link

cloudflare-workers-and-pages bot commented Jan 2, 2023

Deploying with  Cloudflare Pages  Cloudflare Pages

Latest commit: 09075d3
Status: ✅  Deploy successful!
Preview URL: https://f0977936.organicmaps.pages.dev
Branch Preview URL: https://weblate-de.organicmaps.pages.dev

View logs

@rtsisyk
Copy link
Member Author

rtsisyk commented Jan 3, 2023

@organicmaps/translations-de, could you please review @nautilusx work?

@rtsisyk
Copy link
Member Author

rtsisyk commented Jan 28, 2023

regenerated, @nautilusx please take a look. I am thinking about merging this PR if nobody else is interested.

content/terms/index.de.md Outdated Show resolved Hide resolved
@j13m126
Copy link

j13m126 commented Jan 28, 2023

I missed this PR, I can have a look at it in the evening if you want to wait.

@rtsisyk
Copy link
Member Author

rtsisyk commented Jan 28, 2023

I missed this PR, I can have a look at it in the evening if you want to wait.

Yes, please.

The question here is to switch German to Weblate or not. What do you think?

@nautilusx
Copy link

nautilusx commented Jan 28, 2023

@rtsisyk please merged the latest strings from Weblate. There 5 newer translated strings on Weblate. (3 weeks ago)

Please only weblate for translations.

@rtsisyk
Copy link
Member Author

rtsisyk commented Jan 28, 2023

@rtsisyk please merged the latest strings from Weblate. There 5 newer translated strings on Weblate. (3 weeks ago)

Please only weblate for translations.

I've just merged all translations and switched Weblate to master branch. German translations are already in master. This PR override original Markdowns and enables generation from Weblate.

@rtsisyk rtsisyk changed the title Integrate German into Weblate Switch German to Weblate Jan 28, 2023
@rtsisyk rtsisyk requested review from nautilusx and j13m126 January 28, 2023 17:32
@rtsisyk
Copy link
Member Author

rtsisyk commented Jan 28, 2023

Re-based to resolve conflicts. No other changes.

---

**Organic Maps** ist eine kostenlose Offline-Karten-App auf Android und iOS für Reisende, Touristen, Wanderer und Radfahrer auf der Grundlage von gemeinschaftlichen **[OpenStreetMap](https://www.openstreetmap.org)** Daten.
Es handelt sich um eine datenschutzfreundliche, quelloffene [Abspaltung][fork] der **Maps.me**-App (früher bekannt als [**MapsWithMe**](https://en.wikipedia.org/wiki/Maps.me)), die von denselben Personen gepflegt wird, die **MapsWithMe** im Jahr 2011 entwickelt haben.
**Organic Maps** ist eine freie und kostenlose Offline-Karten-App für Android und iOS für Reisende, Touristen, Wanderer und Radfahrer, die auf den Daten von **[OpenStreetMap][openstreetmap]** basiert. Es handelt sich um eine datenschutzfreundliche, quelloffene [fork][fork] der **Maps.me** App (früher bekannt als [**MapsWithMe**][mapswithme]), die von denselben Leuten gepflegt wird, die **MapsWithMe** im Jahr 2011 erstellt haben.
Copy link

Choose a reason for hiding this comment

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

... quelloffene [Fork][fork] der ....

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated on Weblate.


Organic Maps ist rein und organisch, mit Liebe gemacht:
Organic Maps ist rein und nachhaltig, mit Liebe gemacht:
Copy link

Choose a reason for hiding this comment

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

rein, nachhaltig und mit Liebe gemacht:

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated on Weblate.

Copy link
Contributor

Choose a reason for hiding this comment

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

Haven't we translated 'organic' with 'organisch' so far?

Copy link
Member

Choose a reason for hiding this comment

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

Let's use Organic Maps in the title and Organisch in other places. It will help people to find the app.

Copy link
Contributor

Choose a reason for hiding this comment

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

A bit off topic: I have not yet understood exactly how the glossary on weblate works, but perhaps we should add the term so that it is translated consistently depending on the language.


Lehne Überwachung ab - nutze deine Freiheit.
Copy link

Choose a reason for hiding this comment

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

'lebe deine Freiheit' would sound better imo.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated on Weblate.

Wir lieben, was wir tun, und wir lieben unsere Nutzer ❤️.
3. Mit deiner Unterstützung wollen wir eine bessere, datenschutzfreundliche Version von Google Maps werden.
1. Wir sind auf deine Spenden angewiesen, damit wir Organic Maps offen und
frei halten können. Und frei von Werbung.
Copy link

Choose a reason for hiding this comment

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

damit wir Organic Maps offen und kostenlos halten können. (free as in free of charge, right?)

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated on Weblate.


Lehne die Überwachung ab - nimm deine Freiheit wahr.
Lehne Überwachung ab - nutze deine Freiheit.
Copy link

Choose a reason for hiding this comment

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

lebe deine Freiheit

- Hilf uns, [Fehler zu beheben][beizutragen] und führe Code-Reviews durch,
wenn du ein Entwickler bist. Jedes behobene, noch so kleine, Problem macht
jemanden glücklicher.
- [Übersetze][translations] fehlende Zeichenketten in der Benutzeroberfläche
Copy link

Choose a reason for hiding this comment

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

I prefer 'Übersetze fehlende Wörter oder Sätze ...'

Sofern nicht durch geltendes Recht vorgeschrieben oder schriftlich
vereinbart, wird Software, die unter dieser Lizenz vertrieben wird, auf
einer "Ist-Zustand" BASIS, OHNE GARANTIEN ODER BEDINGUNGEN JEGLICHER ART,
weder explizit noch impliziert, angeboten. Nähere Informationen, die genaue
Copy link

Choose a reason for hiding this comment

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

implizit

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated.

@@ -54,64 +61,68 @@ Organic Maps ist frei von Trackern und anderen schädlichen Dingen:
- Kein lästiger E-Mail-Spam
- Keine Push-Benachrichtigungen
- Keine Crapware
- ~~Keine Pestizide~~ - Rein und organisch!
- ~~Keine Pestizide~~ Rein und organisch!
Copy link

Choose a reason for hiding this comment

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

the translation of 'pure and organic' in content/_index.de.md has been changed to 'rein und nachhaltig' (pure and sustainable), which sounds better to me. It should be changed here as well.

po/content.de.po Outdated
@@ -211,7 +211,7 @@ msgstr "Keine Crapware"
#. type: Bullet: '- '
#: content/_index.md
msgid "~~No pesticides~~ Purely organic!"
msgstr "~~Keine Pestizide~~ Rein biologisch!"
msgstr "~~Keine Pestizide~~ Rein und organisch!"
Copy link

Choose a reason for hiding this comment

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

the translation of 'pure and organic' in content/_index.de.md has been changed to 'rein und nachhaltig' (pure and sustainable), which sounds better to me. It should be changed here as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

extra:
menu_title: Startseite
page_template: index.html
sort_by: weight
title: 'Organic Maps: Offline Wandern, Radfahren, Wanderwege und Navigation'
Copy link
Member

Choose a reason for hiding this comment

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

It is safer to use double quotes to avoid apostrophe issues.

Copy link
Member Author

Choose a reason for hiding this comment

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

This YAML is generated by YAML library.


## Funktionen
{{ screenshot(src='/images/screenshots/dark.jpg', alt='Navigation im dunklen
Modus') }}
Copy link
Member

Choose a reason for hiding this comment

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

Why is it moved to a new line? Let's increase the char limit per line.

Copy link
Member Author

Choose a reason for hiding this comment

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

I will take a look.


## Wer zahlt für die kostenlose App?

Die App ist für alle kostenlos. Bitte unterstütze uns mit einer [Spende](@/donate/index.de.md)!
Die App ist für alle kostenlos. Bitte unterstütze uns mit einer
[Spende][donate]!
Copy link
Member

Choose a reason for hiding this comment

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

Is it the correct link to the DE version?

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.


### Trage zur App bei

Es gibt viele Möglichkeiten beizutragen die [hier](@/support-us/index.de.md) aufgeführt sind.
Copy link
Member

Choose a reason for hiding this comment

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

Was this section and link lost?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not lost, but was synchronized with English source. I don't see this section in English.

Copy link
Member

Choose a reason for hiding this comment

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

Unfortunately, it was lost in English.

Ja! Es gibt viele Möglichkeiten, Organic Maps zu unterstützen. Weitere Details findest du auf der
[Beitragen](@/support-us/index.de.md) Seite.
Ja! Es gibt viele Möglichkeiten, Organic Maps zu unterstützen. Weitere
Details findest du auf der [Beitragen](@/support-us/index.md) Seite.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Details findest du auf der [Beitragen](@/support-us/index.md) Seite.
Details findest du auf der [Beitragen](@/support-us/index.de.md) Seite.

- Bewerte uns in [Google Play](market://details?id=app.organicmaps),
[Apple Store](https://itunes.apple.com/app/id1567437057?action=write-review),
[Huawei Appgallery](appmarket://details?id=app.organicmaps).
- [Spenden][spenden]! Jeder Dollar oder Euro zählt und hilft uns, die Server
Copy link
Member

Choose a reason for hiding this comment

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

Is it a correctly localized link?

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

@rtsisyk
Copy link
Member Author

rtsisyk commented Jan 29, 2023

Updated translations as suggested above and re-generated Markdowns.

@nautilusx
Copy link

@rtsisyk thanks for the change. We should use only one source of truth for the source code/source string which is Github and only allow translations from Weblate.

In my opinion otherwise there are only problems and it is too annoying for all (devs and translators).

I changed one string on Weblate. All other changes are fine.

@nautilusx nautilusx requested a review from biodranik January 29, 2023 09:42
This patch overwrites German Markdowns with translations from Weblate.
Any further edits should be done through Weblate.

Translate-URL: https://hosted.weblate.org/projects/organicmaps/website/de/
Signed-off-by: nautilusx <translate@disroot.org>
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
@rtsisyk
Copy link
Member Author

rtsisyk commented Feb 5, 2023

Re-based on the latest master with all recent changes from Weblate.

Copy link
Member

@biodranik biodranik left a comment

Choose a reason for hiding this comment

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

I'm ok if de translation team is ok.

Copy link
Contributor

@csidirop csidirop left a comment

Choose a reason for hiding this comment

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

I'm not that happy with some wording but thats not the point here. I will look at those in weblate. Rest seams fine, I think.

@nautilusx
Copy link

It's fine. @csidirop let's find the best translations on weblate.

@rtsisyk rtsisyk merged commit b25abf1 into master Feb 9, 2023
@rtsisyk rtsisyk deleted the weblate-de branch February 9, 2023 08:01
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.

5 participants